[CVS] RPM: rpm/ CHANGES rpm/scripts/ check-multiarch-files

2011-06-28 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   28-Jun-2011 14:00:20
  Branch: HEAD Handle: 2011062812001900

  Modified files:
rpm CHANGES
rpm/scripts check-multiarch-files

  Log:
check-multiarch-files: remove unnecessary import of MDK::Common,
causing undesired dependency from perl dependency generator.

  Summary:
RevisionChanges Path
1.3659  +2  -0  rpm/CHANGES
1.2 +0  -1  rpm/scripts/check-multiarch-files
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3658 -r1.3659 CHANGES
  --- rpm/CHANGES   20 Jun 2011 14:45:43 -  1.3658
  +++ rpm/CHANGES   28 Jun 2011 12:00:19 -  1.3659
  @@ -1,4 +1,6 @@
   HEAD:
  +- proyvind: check-multiarch-files: remove unnecessary import of 
MDK::Common,
  + causing undesired dependency from perl dependency generator.
   - devzero2000: add a simple usage command to devtool
   - proyvind: fix broken %optflags for i686-linux macros.
   - proyvind: mandriva: fix implicit %clean not being run when %changelog 
is
  @@ .
  patch -p0 '@@ .'
  Index: rpm/scripts/check-multiarch-files
  
  $ cvs diff -u -r1.1 -r1.2 check-multiarch-files
  --- rpm/scripts/check-multiarch-files 10 Apr 2011 13:50:28 -  1.1
  +++ rpm/scripts/check-multiarch-files 28 Jun 2011 12:00:19 -  1.2
  @@ -5,7 +5,6 @@
   #---
   
   use strict;
  -use MDK::Common;
   
   my $RPM_BUILD_ROOT = (shift);
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/scripts/ check-multiarch-files

2011-06-28 Thread Per �yvind Karlsen
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   28-Jun-2011 14:03:35
  Branch: rpm-5_3  Handle: 2011062812033401

  Modified files:   (Branch: rpm-5_3)
rpm CHANGES
rpm/scripts check-multiarch-files

  Log:
check-multiarch-files: remove unnecessary import of MDK::Common,
causing undesired dependency from perl dependency generator.

  Summary:
RevisionChanges Path
1.3296.2.240+2  -0  rpm/CHANGES
1.1.4.3 +0  -1  rpm/scripts/check-multiarch-files
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3296.2.239 -r1.3296.2.240 CHANGES
  --- rpm/CHANGES   16 Jun 2011 08:31:30 -  1.3296.2.239
  +++ rpm/CHANGES   28 Jun 2011 12:03:34 -  1.3296.2.240
  @@ -1,4 +1,6 @@
   5.3.12 - 5.3.13
  +- proyvind: check-multiarch-files: remove unnecessary import of 
MDK::Common,
  + causing undesired dependency from perl dependency generator.
   - proyvind: fix broken %optflags for i686-linux macros.
   - proyvind: mandriva: fix implicit %clean not being run when %changelog 
is
present.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/scripts/check-multiarch-files
  
  $ cvs diff -u -r1.1.4.2 -r1.1.4.3 check-multiarch-files
  --- rpm/scripts/check-multiarch-files 10 Apr 2011 13:54:19 -  1.1.4.2
  +++ rpm/scripts/check-multiarch-files 28 Jun 2011 12:03:35 -  1.1.4.3
  @@ -5,7 +5,6 @@
   #---
   
   use strict;
  -use MDK::Common;
   
   my $RPM_BUILD_ROOT = (shift);
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/tools/ dbconvert.c

2011-06-28 Thread Pinto Elia
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   28-Jun-2011 14:26:11
  Branch: rpm-5_4  Handle: 2011062812261001

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/tools   dbconvert.c

  Log:
merge from HEAD afb patch portability of endian

  Summary:
RevisionChanges Path
1.3501.2.144+1  -0  rpm/CHANGES
2.472.2.25  +2  -2  rpm/configure.ac
2.1.2.6 +10 -1  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.143 -r1.3501.2.144 CHANGES
  --- rpm/CHANGES   28 Jun 2011 12:01:47 -  1.3501.2.143
  +++ rpm/CHANGES   28 Jun 2011 12:26:10 -  1.3501.2.144
  @@ -1,4 +1,5 @@
   5.4.1 - 5.4.2
  +- devzero2000: merge afb patch portability of endian
   - proyvind: check-multiarch-files: remove unnecessary import of 
MDK::Common,
causing undesired dependency from perl dependency generator.
   - devzero2000: add a simple usage command to devtool
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.24 -r2.472.2.25 configure.ac
  --- rpm/configure.ac  20 Jun 2011 12:33:27 -  2.472.2.24
  +++ rpm/configure.ac  28 Jun 2011 12:26:10 -  2.472.2.25
  @@ -672,8 +672,8 @@
   dnl # standard headers (generic)
   AC_CHECK_HEADERS([dnl
   fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl
  -signal.h sys/ipc.h sys/socket.h sys/select.h sys/time.h dnl
  -sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl
  +signal.h sys/endian.h sys/ipc.h sys/socket.h sys/select.h dnl
  +sys/time.h sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl
   sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl
   machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl
   sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.5 -r2.1.2.6 dbconvert.c
  --- rpm/tools/dbconvert.c 2 Jun 2011 17:39:41 -   2.1.2.5
  +++ rpm/tools/dbconvert.c 28 Jun 2011 12:26:11 -  2.1.2.6
  @@ -18,9 +18,18 @@
   #include rpmts.h
   #include rpmlog.h
   
  +#ifdef HAVE_SYS_ENDIAN_H
  +#include sys/endian.h
  +#endif
  +#ifdef __APPLE__
  +#include libkern/OSByteOrder.h
  +
  +#define htobe32(x) OSSwapHostToBigInt32(x)
  +#define htole32(x) OSSwapHostToLittleInt32(x)
  +#endif /* __APPLE__ */
   #if BYTE_ORDER == LITTLE_ENDIAN
   #define bswap32(x) htobe32(x)
  -#elif __BYTE_ORDER == BIG_ENDIAN
  +#elif BYTE_ORDER == BIG_ENDIAN
   #define bswap32(x) htole32(x)
   #endif
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/tools/ dbconvert.c

2011-06-28 Thread Pinto Elia
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   28-Jun-2011 14:31:12
  Branch: rpm-5_3  Handle: 2011062812311101

  Modified files:   (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/tools   dbconvert.c

  Log:
merge from HEAD afb patch portability of endian

  Summary:
RevisionChanges Path
1.3296.2.241+1  -0  rpm/CHANGES
2.432.2.62  +2  -2  rpm/configure.ac
2.1.4.5 +10 -1  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3296.2.240 -r1.3296.2.241 CHANGES
  --- rpm/CHANGES   28 Jun 2011 12:03:34 -  1.3296.2.240
  +++ rpm/CHANGES   28 Jun 2011 12:31:11 -  1.3296.2.241
  @@ -1,4 +1,5 @@
   5.3.12 - 5.3.13
  +- devzero2000: merge afb patch portability of endian
   - proyvind: check-multiarch-files: remove unnecessary import of 
MDK::Common,
causing undesired dependency from perl dependency generator.
   - proyvind: fix broken %optflags for i686-linux macros.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.432.2.61 -r2.432.2.62 configure.ac
  --- rpm/configure.ac  2 Jun 2011 17:22:47 -   2.432.2.61
  +++ rpm/configure.ac  28 Jun 2011 12:31:11 -  2.432.2.62
  @@ -628,8 +628,8 @@
   dnl # standard headers (generic)
   AC_CHECK_HEADERS([dnl
   fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl
  -signal.h sys/ipc.h sys/socket.h sys/select.h sys/time.h dnl
  -sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl
  +signal.h sys/endian.h sys/ipc.h sys/socket.h sys/select.h dnl
  +sys/time.h sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl
   sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl
   machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl
   sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.4.4 -r2.1.4.5 dbconvert.c
  --- rpm/tools/dbconvert.c 10 Apr 2011 10:17:22 -  2.1.4.4
  +++ rpm/tools/dbconvert.c 28 Jun 2011 12:31:12 -  2.1.4.5
  @@ -18,9 +18,18 @@
   #include rpmts.h
   #include rpmlog.h
   
  +#ifdef HAVE_SYS_ENDIAN_H
  +#include sys/endian.h
  +#endif
  +#ifdef __APPLE__
  +#include libkern/OSByteOrder.h
  +
  +#define htobe32(x) OSSwapHostToBigInt32(x)
  +#define htole32(x) OSSwapHostToLittleInt32(x)
  +#endif /* __APPLE__ */
   #if BYTE_ORDER == LITTLE_ENDIAN
   #define bswap32(x) htobe32(x)
  -#elif __BYTE_ORDER == BIG_ENDIAN
  +#elif BYTE_ORDER == BIG_ENDIAN
   #define bswap32(x) htole32(x)
   #endif
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org