OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   05-Aug-2005 20:40:40
  Branch: HEAD                             Handle: 2005080519403900

  Modified files:
    openpkg-src/openpkg     HISTORY openpkg.spec rpm.patch.porting
                            rpm.patch.regen

  Log:
    temporary workaround defeating problems with Fedora Core 4 vendor
    compiler

  Summary:
    Revision    Changes     Path
    1.284       +1  -0      openpkg-src/openpkg/HISTORY
    1.438       +1  -1      openpkg-src/openpkg/openpkg.spec
    1.67        +19 -0      openpkg-src/openpkg/rpm.patch.porting
    1.57        +23 -0      openpkg-src/openpkg/rpm.patch.regen
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/HISTORY
  ============================================================================
  $ cvs diff -u -r1.283 -r1.284 HISTORY
  --- openpkg-src/openpkg/HISTORY       27 Jul 2005 15:06:17 -0000      1.283
  +++ openpkg-src/openpkg/HISTORY       5 Aug 2005 18:40:39 -0000       1.284
  @@ -2,6 +2,7 @@
   2005
   ====
   
  +20050804 temporary workaround defeating problems with Fedora Core 4 vendor 
compiler
   20050727 remove dependency to binutils tools size(1) and strip(1)
   20050727 added to rpmtool the detection for "number of CPUs" under AIX for 
"make -j"
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================================
  $ cvs diff -u -r1.437 -r1.438 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  27 Jul 2005 15:06:17 -0000      1.437
  +++ openpkg-src/openpkg/openpkg.spec  5 Aug 2005 18:40:39 -0000       1.438
  @@ -38,7 +38,7 @@
   #   o any cc(1)
   
   #   the package version/release
  -%define       V_openpkg  20050727
  +%define       V_openpkg  20050805
   
   #   the used software versions
   %define       V_rpm      4.2.1
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpm.patch.porting
  ============================================================================
  $ cvs diff -u -r1.66 -r1.67 rpm.patch.porting
  --- openpkg-src/openpkg/rpm.patch.porting     8 Jun 2005 13:25:48 -0000       
1.66
  +++ openpkg-src/openpkg/rpm.patch.porting     5 Aug 2005 18:40:39 -0000       
1.67
  @@ -529,6 +529,25 @@
    /* Define to `long' if <sys/types.h> does not define. */
    #undef off_t
    
  ++---------------------------------------------------------------------------
  +| Use private uint*_t only if not having stdint.h (unbreak file on FC4/cc)
  ++---------------------------------------------------------------------------
  +Index: file/config.h.in
  +--- file/config.h.in.orig    2005-08-04 10:21:26.000000000 +0100
  ++++ file/config.h.in 2005-08-04 10:25:04.000000000 +0100
  +@@ -174,6 +174,7 @@
  + /* Define to `unsigned' if <sys/types.h> does not define. */
  + #undef size_t
  +
  ++#ifndef HAVE_STDINT_H
  + /* uint16_t */
  + #undef uint16_t
  +
  +@@ -185,3 +186,4 @@
  +
  + /* uint8_t */
  + #undef uint8_t
  ++#endif
   
   +---------------------------------------------------------------------------
   | Add int32_t detection and automatic fallback support.
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpm.patch.regen
  ============================================================================
  $ cvs diff -u -r1.56 -r1.57 rpm.patch.regen
  --- openpkg-src/openpkg/rpm.patch.regen       8 Jun 2005 13:25:48 -0000       
1.56
  +++ openpkg-src/openpkg/rpm.patch.regen       5 Aug 2005 18:40:39 -0000       
1.57
  @@ -1025,3 +1025,26 @@
    
    
    
  ++---------------------------------------------------------------------------
  +| Use private uint*_t only if not having stdint.h (unbreak rpmio on FC4/cc)
  ++---------------------------------------------------------------------------
  +Index: config.h.in
  +--- config.h.in.orig 2005-08-04 12:14:39.000000000 +0100
  ++++ config.h.in      2005-08-04 12:37:58.000000000 +0100
  +@@ -574,6 +574,7 @@
  + /* Define to `unsigned' if <sys/types.h> does not define. */
  + #undef size_t
  + 
  ++#ifndef HAVE_STDINT_H
  + /* uint16_t */
  + #undef uint16_t
  + 
  +@@ -582,6 +583,7 @@
  + 
  + /* uint8_t */
  + #undef uint8_t
  ++#endif
  + 
  + /* Define to unsigned long or unsigned long long if <inttypes.h> and
  +    <stdint.h> don't define. */
  +
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to