[CVS] RPM: rpm/ devtool.conf
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: 25-Jan-2011 14:37:01 Branch: HEAD Handle: 2011012513365900 Modified files: rpm devtool.conf Log: use external popt for cooker Summary: RevisionChanges Path 2.370 +1 -2 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.369 -r2.370 devtool.conf --- rpm/devtool.conf 9 Jan 2011 02:16:19 - 2.369 +++ rpm/devtool.conf 25 Jan 2011 13:36:59 - 2.370 @@ -781,7 +781,7 @@ --with-attr \ --with-acl \ --without-xar \ ---with-popt=internal \ +--with-popt=external \ --with-keyutils \ --with-pthreads \ --with-libelf \ @@ -807,7 +807,6 @@ --with-valgrind \ --with-cpuinfo \ --with-vendor=mandriva \ - --with-path-premacros=/etc/rpm/premacros.d \ --enable-build-pic \ --enable-build-versionscript \ --enable-build-warnings \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ devtool.conf
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: 25-Jan-2011 14:39:47 Branch: rpm-5_4 Handle: 2011012513394600 Modified files: (Branch: rpm-5_4) rpm devtool.conf Log: use external popt for cooker Summary: RevisionChanges Path 2.365.2.4 +1 -2 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.3 -r2.365.2.4 devtool.conf --- rpm/devtool.conf 9 Jan 2011 02:27:14 - 2.365.2.3 +++ rpm/devtool.conf 25 Jan 2011 13:39:46 - 2.365.2.4 @@ -781,7 +781,7 @@ --with-attr \ --with-acl \ --without-xar \ ---with-popt=internal \ +--with-popt=external \ --with-keyutils \ --with-pthreads \ --with-libelf \ @@ -807,7 +807,6 @@ --with-valgrind \ --with-cpuinfo \ --with-vendor=mandriva \ - --with-path-premacros=/etc/rpm/premacros.d \ --enable-build-pic \ --enable-build-versionscript \ --enable-build-warnings \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ devtool.conf
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: 25-Jan-2011 14:40:10 Branch: rpm-5_3 Handle: 2011012513400800 Modified files: (Branch: rpm-5_3) rpm devtool.conf Log: use external popt for cooker Summary: RevisionChanges Path 2.333.2.71 +1 -2 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.333.2.70 -r2.333.2.71 devtool.conf --- rpm/devtool.conf 9 Jan 2011 02:34:00 - 2.333.2.70 +++ rpm/devtool.conf 25 Jan 2011 13:40:08 - 2.333.2.71 @@ -781,7 +781,7 @@ --with-attr \ --with-acl \ --without-xar \ ---with-popt=internal \ +--with-popt=external \ --with-keyutils \ --with-pthreads \ --with-libelf \ @@ -807,7 +807,6 @@ --with-valgrind \ --with-cpuinfo \ --with-vendor=mandriva \ - --with-path-premacros=/etc/rpm/premacros.d \ --enable-build-pic \ --enable-build-versionscript \ --enable-build-warnings \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/perl/t/ 10.sign.t
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: 25-Jan-2011 14:57:35 Branch: HEAD Handle: 2011012513573500 Modified files: rpm/perl/t 10.sign.t Log: disable hkp keyserver query to speed up test Summary: RevisionChanges Path 1.4 +1 -0 rpm/perl/t/10.sign.t patch -p0 <<'@@ .' Index: rpm/perl/t/10.sign.t $ cvs diff -u -r1.3 -r1.4 10.sign.t --- rpm/perl/t/10.sign.t 2 Dec 2010 16:42:07 - 1.3 +++ rpm/perl/t/10.sign.t 25 Jan 2011 13:57:35 - 1.4 @@ -17,6 +17,7 @@ RPM::load_macro_file('../macros/macros'); RPM::setverbosity(6); RPM::add_macro("_dbpath $testdir"); +RPM::delete_macro("_hkp_keyserver_query"); copy("test-rpm-1.0-1.noarch.rpm", "$testdir"); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/perl/t/ 10.sign.t
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: 25-Jan-2011 14:57:53 Branch: rpm-5_4 Handle: 2011012513575300 Modified files: (Branch: rpm-5_4) rpm/perl/t 10.sign.t Log: disable hkp keyserver query to speed up test Summary: RevisionChanges Path 1.3.2.1 +1 -0 rpm/perl/t/10.sign.t patch -p0 <<'@@ .' Index: rpm/perl/t/10.sign.t $ cvs diff -u -r1.3 -r1.3.2.1 10.sign.t --- rpm/perl/t/10.sign.t 2 Dec 2010 16:42:07 - 1.3 +++ rpm/perl/t/10.sign.t 25 Jan 2011 13:57:53 - 1.3.2.1 @@ -17,6 +17,7 @@ RPM::load_macro_file('../macros/macros'); RPM::setverbosity(6); RPM::add_macro("_dbpath $testdir"); +RPM::delete_macro("_hkp_keyserver_query"); copy("test-rpm-1.0-1.noarch.rpm", "$testdir"); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/perl/t/ 10.sign.t
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: 25-Jan-2011 14:58:29 Branch: rpm-5_3 Handle: 2011012513582900 Modified files: (Branch: rpm-5_3) rpm/perl/t 10.sign.t Log: disable hkp keyserver query to speed up test Summary: RevisionChanges Path 1.1.2.4 +1 -0 rpm/perl/t/10.sign.t patch -p0 <<'@@ .' Index: rpm/perl/t/10.sign.t $ cvs diff -u -r1.1.2.3 -r1.1.2.4 10.sign.t --- rpm/perl/t/10.sign.t 2 Dec 2010 16:57:41 - 1.1.2.3 +++ rpm/perl/t/10.sign.t 25 Jan 2011 13:58:29 - 1.1.2.4 @@ -17,6 +17,7 @@ RPM::load_macro_file('../macros/macros'); RPM::setverbosity(6); RPM::add_macro("_dbpath $testdir"); +RPM::delete_macro("_hkp_keyserver_query"); copy("test-rpm-1.0-1.noarch.rpm", "$testdir"); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/tests/ref/ hkp
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: 25-Jan-2011 15:03:19 Branch: rpm-5_3 Handle: 2011012514031900 Modified files: (Branch: rpm-5_3) rpm/tests/ref hkp Log: sync with HEAD to fix test Summary: RevisionChanges Path 1.1.2.4 +1 -1 rpm/tests/ref/hkp patch -p0 <<'@@ .' Index: rpm/tests/ref/hkp $ cvs diff -u -r1.1.2.3 -r1.1.2.4 hkp --- rpm/tests/ref/hkp 24 May 2010 15:36:55 - 1.1.2.3 +++ rpm/tests/ref/hkp 25 Jan 2011 14:03:19 - 1.1.2.4 @@ -4,7 +4,7 @@ NOKEY0xa520e8f1cba29bf9 OK 0x9AC53D4D BAD 0x7AD0BECB -BAD 0x7C611479 +OK 0x7C611479 OK 0x1CFC22F3363DEAE3 OK 0xb873641b2039b291 OK Jeff Johnson (ARS N3NPQ) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
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: 25-Jan-2011 15:41:47 Branch: HEAD Handle: 2011012514414700 Modified files: rpm Makefile.am Log: add missing file required by test suite to generated tarball Summary: RevisionChanges Path 2.264 +1 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.263 -r2.264 Makefile.am --- rpm/Makefile.am 2 Dec 2010 14:11:47 - 2.263 +++ rpm/Makefile.am 25 Jan 2011 14:41:47 - 2.264 @@ -21,6 +21,7 @@ tests/devtool-sanity-1.0-1.src.rpm \ tests/edos-test-1-0.src.rpm \ tests/probes-test-1-0.src.rpm \ + tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm \ tests/triggers-D-1.0-1.src.rpm \ tests/triggers-DP-1.0-1.src.rpm \ tests/triggers-F-1.0-1.src.rpm \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ Makefile.am
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: 25-Jan-2011 15:42:46 Branch: rpm-5_4 Handle: 2011012514424500 Modified files: (Branch: rpm-5_4) rpm Makefile.am Log: add missing file required by test suite to generated tarball Summary: RevisionChanges Path 2.263.2.1 +1 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.263 -r2.263.2.1 Makefile.am --- rpm/Makefile.am 2 Dec 2010 14:11:47 - 2.263 +++ rpm/Makefile.am 25 Jan 2011 14:42:45 - 2.263.2.1 @@ -21,6 +21,7 @@ tests/devtool-sanity-1.0-1.src.rpm \ tests/edos-test-1-0.src.rpm \ tests/probes-test-1-0.src.rpm \ + tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm \ tests/triggers-D-1.0-1.src.rpm \ tests/triggers-DP-1.0-1.src.rpm \ tests/triggers-F-1.0-1.src.rpm \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmds.c
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: 25-Jan-2011 15:47:17 Branch: HEAD Handle: 2011012514471400 Modified files: rpm/lib rpmds.c Log: handle missing release & distepoch in rpmdsCompare() as well Summary: RevisionChanges Path 2.172 +7 -0 rpm/lib/rpmds.c patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.171 -r2.172 rpmds.c --- rpm/lib/rpmds.c 3 Jan 2011 21:20:23 - 2.171 +++ rpm/lib/rpmds.c 25 Jan 2011 14:47:14 - 2.172 @@ -3848,7 +3848,14 @@ case 'R':ix = RPMEVR_R; /*@switchbreak@*/break; case 'D':ix = RPMEVR_D; /*@switchbreak@*/break; } +#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ + if(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && *(b->F[ix]) == '\0') + break; + if (a->F[ix] && b->F[ix]) +#else if (a->F[ix] && *a->F[ix] && b->F[ix] && *b->F[ix]) +#endif /*@i@*/ sense = EVRcmp(a->F[ix], b->F[ix]); if (sense) break; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/lib/ rpmds.c
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: 25-Jan-2011 15:47:48 Branch: rpm-5_4 Handle: 2011012514474700 Modified files: (Branch: rpm-5_4) rpm/lib rpmds.c Log: handle missing release & distepoch in rpmdsCompare() as well Summary: RevisionChanges Path 2.170.2.2 +7 -0 rpm/lib/rpmds.c patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.170.2.1 -r2.170.2.2 rpmds.c --- rpm/lib/rpmds.c 3 Jan 2011 21:21:39 - 2.170.2.1 +++ rpm/lib/rpmds.c 25 Jan 2011 14:47:47 - 2.170.2.2 @@ -3848,7 +3848,14 @@ case 'R':ix = RPMEVR_R; /*@switchbreak@*/break; case 'D':ix = RPMEVR_D; /*@switchbreak@*/break; } +#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ + if(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && *(b->F[ix]) == '\0') + break; + if (a->F[ix] && b->F[ix]) +#else if (a->F[ix] && *a->F[ix] && b->F[ix] && *b->F[ix]) +#endif /*@i@*/ sense = EVRcmp(a->F[ix], b->F[ix]); if (sense) break; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ rpmds.c
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: 25-Jan-2011 15:48:13 Branch: rpm-5_3 Handle: 2011012514481000 Modified files: (Branch: rpm-5_3) rpm/lib rpmds.c Log: handle missing release & distepoch in rpmdsCompare() as well Summary: RevisionChanges Path 2.167.2.5 +7 -0 rpm/lib/rpmds.c patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.167.2.4 -r2.167.2.5 rpmds.c --- rpm/lib/rpmds.c 4 Nov 2010 21:34:03 - 2.167.2.4 +++ rpm/lib/rpmds.c 25 Jan 2011 14:48:10 - 2.167.2.5 @@ -3849,7 +3849,14 @@ case 'R':ix = RPMEVR_R; /*@switchbreak@*/break; case 'D':ix = RPMEVR_D; /*@switchbreak@*/break; } +#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ + if(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL)) + && *(b->F[ix]) == '\0') + break; + if (a->F[ix] && b->F[ix]) +#else if (a->F[ix] && *a->F[ix] && b->F[ix] && *b->F[ix]) +#endif /*@i@*/ sense = EVRcmp(a->F[ix], b->F[ix]); if (sense) break; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmdb/ db3.c
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: 25-Jan-2011 15:50:56 Branch: HEAD Handle: 2011012514505600 Modified files: rpm/rpmdb db3.c Log: sync max number of locks with DB_CONFIG Summary: RevisionChanges Path 1.161 +1 -1 rpm/rpmdb/db3.c patch -p0 <<'@@ .' Index: rpm/rpmdb/db3.c $ cvs diff -u -r1.160 -r1.161 db3.c --- rpm/rpmdb/db3.c 17 Jan 2011 23:29:53 - 1.160 +++ rpm/rpmdb/db3.c 25 Jan 2011 14:50:56 - 1.161 @@ -899,7 +899,7 @@ } /* Locking: */ -#define _RPMDB_NLOCKS 8192 +#define _RPMDB_NLOCKS 16384 if (eflags & DB_INIT_LOCK) { uint32_t _lk_max_lockers = _RPMDB_NLOCKS; uint32_t _lk_max_locks = _RPMDB_NLOCKS; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ db3.c
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: 25-Jan-2011 15:51:43 Branch: rpm-5_4 Handle: 2011012514514300 Modified files: (Branch: rpm-5_4) rpm/rpmdb db3.c Log: sync max number of locks with DB_CONFIG Summary: RevisionChanges Path 1.156.2.5 +1 -1 rpm/rpmdb/db3.c patch -p0 <<'@@ .' Index: rpm/rpmdb/db3.c $ cvs diff -u -r1.156.2.4 -r1.156.2.5 db3.c --- rpm/rpmdb/db3.c 17 Jan 2011 23:30:29 - 1.156.2.4 +++ rpm/rpmdb/db3.c 25 Jan 2011 14:51:43 - 1.156.2.5 @@ -899,7 +899,7 @@ } /* Locking: */ -#define _RPMDB_NLOCKS 8192 +#define _RPMDB_NLOCKS 16384 if (eflags & DB_INIT_LOCK) { uint32_t _lk_max_lockers = _RPMDB_NLOCKS; uint32_t _lk_max_locks = _RPMDB_NLOCKS; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/rpmdb/ db3.c
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: 25-Jan-2011 15:53:16 Branch: rpm-5_3 Handle: 2011012514531600 Modified files: (Branch: rpm-5_3) rpm/rpmdb db3.c Log: sync max number of locks with DB_CONFIG Summary: RevisionChanges Path 1.150.2.9 +1 -1 rpm/rpmdb/db3.c patch -p0 <<'@@ .' Index: rpm/rpmdb/db3.c $ cvs diff -u -r1.150.2.8 -r1.150.2.9 db3.c --- rpm/rpmdb/db3.c 24 Jan 2011 13:32:27 - 1.150.2.8 +++ rpm/rpmdb/db3.c 25 Jan 2011 14:53:16 - 1.150.2.9 @@ -899,7 +899,7 @@ } /* Locking: */ -#define _RPMDB_NLOCKS 8192 +#define _RPMDB_NLOCKS 16384 if (eflags & DB_INIT_LOCK) { uint32_t _lk_max_lockers = _RPMDB_NLOCKS; uint32_t _lk_max_locks = _RPMDB_NLOCKS; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ Makefile.am
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: 25-Jan-2011 15:54:24 Branch: rpm-5_3 Handle: 2011012514542400 Modified files: (Branch: rpm-5_3) rpm Makefile.am Log: add missing file required by test suite to generated tarball Summary: RevisionChanges Path 2.247.2.15 +1 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.247.2.14 -r2.247.2.15 Makefile.am --- rpm/Makefile.am 31 Oct 2010 03:37:09 - 2.247.2.14 +++ rpm/Makefile.am 25 Jan 2011 14:54:24 - 2.247.2.15 @@ -21,6 +21,7 @@ tests/devtool-sanity-1.0-1.src.rpm \ tests/edos-test-1-0.src.rpm \ tests/probes-test-1-0.src.rpm \ + tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm \ tests/triggers-D-1.0-1.src.rpm \ tests/triggers-DP-1.0-1.src.rpm \ tests/triggers-F-1.0-1.src.rpm \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/scripts/ rpm.daily
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: 25-Jan-2011 16:16:01 Branch: rpm-5_4 Handle: 2011012515155500 Modified files: (Branch: rpm-5_4) rpm/scripts rpm.daily Log: don't make path to rpm binary absolute Summary: RevisionChanges Path 1.3.12.2+1 -1 rpm/scripts/rpm.daily patch -p0 <<'@@ .' Index: rpm/scripts/rpm.daily $ cvs diff -u -r1.3.12.1 -r1.3.12.2 rpm.daily --- rpm/scripts/rpm.daily 12 Jan 2011 22:02:42 - 1.3.12.1 +++ rpm/scripts/rpm.daily 25 Jan 2011 15:15:55 - 1.3.12.2 @@ -1,3 +1,3 @@ #!/bin/sh -/usr/bin/rpm -qa 2>&1 | sort > /var/log/rpmpkgs +rpm -qa 2>&1 | sort > /var/log/rpmpkgs @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/scripts/ trpm
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: 25-Jan-2011 16:16:34 Branch: rpm-5_4 Handle: 2011012515163100 Modified files: (Branch: rpm-5_4) rpm/scripts trpm Log: don't make path to rpm binary absolute Summary: RevisionChanges Path 1.12.20.2 +3 -3 rpm/scripts/trpm patch -p0 <<'@@ .' Index: rpm/scripts/trpm $ cvs diff -u -r1.12.20.1 -r1.12.20.2 trpm --- rpm/scripts/trpm 12 Jan 2011 22:02:42 - 1.12.20.1 +++ rpm/scripts/trpm 25 Jan 2011 15:16:31 - 1.12.20.2 @@ -10,9 +10,9 @@ rpmi="$rpm" #rpmi=/usr/lib/rpm/rpmi rpmb=/usr/bin/rpmbuild -rpmq=/usr/bin/rpm -rpmdb=/usr/bin/rpm -rpmk=/usr/bin/rpms +rpmq=$rpm +rpmdb=$rpm +rpmk=$rpm pgppubkey="`echo /usr/share/doc/rpm-4*/RPM-PGP-KEY`" gpgpubkey="`echo /usr/share/doc/rpm-4*/RPM-GPG-KEY`" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/scripts/ rpm.daily trpm
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: 25-Jan-2011 16:17:26 Branch: rpm-5_3 Handle: 2011012515172302 Modified files: (Branch: rpm-5_3) rpm/scripts rpm.daily trpm Log: don't make path to rpm binary absolute Summary: RevisionChanges Path 1.3.10.2+1 -1 rpm/scripts/rpm.daily 1.12.18.2 +3 -3 rpm/scripts/trpm patch -p0 <<'@@ .' Index: rpm/scripts/rpm.daily $ cvs diff -u -r1.3.10.1 -r1.3.10.2 rpm.daily --- rpm/scripts/rpm.daily 12 Jan 2011 22:02:45 - 1.3.10.1 +++ rpm/scripts/rpm.daily 25 Jan 2011 15:17:25 - 1.3.10.2 @@ -1,3 +1,3 @@ #!/bin/sh -/usr/bin/rpm -qa 2>&1 | sort > /var/log/rpmpkgs +rpm -qa 2>&1 | sort > /var/log/rpmpkgs @@ . patch -p0 <<'@@ .' Index: rpm/scripts/trpm $ cvs diff -u -r1.12.18.1 -r1.12.18.2 trpm --- rpm/scripts/trpm 12 Jan 2011 22:02:45 - 1.12.18.1 +++ rpm/scripts/trpm 25 Jan 2011 15:17:23 - 1.12.18.2 @@ -10,9 +10,9 @@ rpmi="$rpm" #rpmi=/usr/lib/rpm/rpmi rpmb=/usr/bin/rpmbuild -rpmq=/usr/bin/rpm -rpmdb=/usr/bin/rpm -rpmk=/usr/bin/rpms +rpmq=$rpm +rpmdb=$rpm +rpmk=$rpm pgppubkey="`echo /usr/share/doc/rpm-4*/RPM-PGP-KEY`" gpgpubkey="`echo /usr/share/doc/rpm-4*/RPM-GPG-KEY`" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ Makefile.am
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: 25-Jan-2011 18:55:08 Branch: HEAD Handle: 2011012517550700 Modified files: rpm/tests Makefile.am Log: don't include genpgp.h in tarball, it needs to be generated during build Summary: RevisionChanges Path 1.97+2 -2 rpm/tests/Makefile.am patch -p0 <<'@@ .' Index: rpm/tests/Makefile.am $ cvs diff -u -r1.96 -r1.97 Makefile.am --- rpm/tests/Makefile.am 25 Dec 2010 18:07:08 - 1.96 +++ rpm/tests/Makefile.am 25 Jan 2011 17:55:07 - 1.97 @@ -176,11 +176,11 @@ thkp_SOURCES = thkp.c thkp_LDADD = $(RPMIO_LDADD) -tkey_SOURCES = genpgp.h tkey.c +tkey_SOURCES = tkey.c tkey_LDADD = $(RPM_LDADD) tkey.c: genpgp.h -tpgp_SOURCES = genpgp.h tpgp.c +tpgp_SOURCES = tpgp.c tpgp_LDADD = $(RPM_LDADD) tpgp.c: genpgp.h genpgp.h: genpgp.sh @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tests/ Makefile.am
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: 25-Jan-2011 18:59:03 Branch: rpm-5_4 Handle: 2011012517590100 Modified files: (Branch: rpm-5_4) rpm/tests Makefile.am Log: don't include genpgp.h in tarball, it needs to be generated during build Summary: RevisionChanges Path 1.95.2.2+2 -2 rpm/tests/Makefile.am patch -p0 <<'@@ .' Index: rpm/tests/Makefile.am $ cvs diff -u -r1.95.2.1 -r1.95.2.2 Makefile.am --- rpm/tests/Makefile.am 25 Dec 2010 18:09:03 - 1.95.2.1 +++ rpm/tests/Makefile.am 25 Jan 2011 17:59:01 - 1.95.2.2 @@ -176,11 +176,11 @@ thkp_SOURCES = thkp.c thkp_LDADD = $(RPMIO_LDADD) -tkey_SOURCES = genpgp.h tkey.c +tkey_SOURCES = tkey.c tkey_LDADD = $(RPM_LDADD) tkey.c: genpgp.h -tpgp_SOURCES = genpgp.h tpgp.c +tpgp_SOURCES = tpgp.c tpgp_LDADD = $(RPM_LDADD) tpgp.c: genpgp.h genpgp.h: genpgp.sh @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/tests/ Makefile.am
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: 25-Jan-2011 18:59:30 Branch: rpm-5_3 Handle: 2011012517593000 Modified files: (Branch: rpm-5_3) rpm/tests Makefile.am Log: don't include genpgp.h in tarball, it needs to be generated during build Summary: RevisionChanges Path 1.63.2.54 +2 -2 rpm/tests/Makefile.am patch -p0 <<'@@ .' Index: rpm/tests/Makefile.am $ cvs diff -u -r1.63.2.53 -r1.63.2.54 Makefile.am --- rpm/tests/Makefile.am 27 Dec 2010 18:24:16 - 1.63.2.53 +++ rpm/tests/Makefile.am 25 Jan 2011 17:59:30 - 1.63.2.54 @@ -138,11 +138,11 @@ thkp_SOURCES = thkp.c thkp_LDADD = $(RPMIO_LDADD) -tkey_SOURCES = genpgp.h tkey.c +tkey_SOURCES = tkey.c tkey_LDADD = $(RPM_LDADD) tkey.c: genpgp.h -tpgp_SOURCES = genpgp.h tpgp.c +tpgp_SOURCES = tpgp.c tpgp_LDADD = $(RPM_LDADD) tpgp.c: genpgp.h genpgp.h: genpgp.sh @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmdb/ hdrfmt.c rpmrepo.h
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: 25-Jan-2011 19:11:53 Branch: HEAD Handle: 2011012518115300 Modified files: rpm/rpmdb hdrfmt.c rpmrepo.h Log: fix typos in doxygen doc Summary: RevisionChanges Path 1.152 +1 -1 rpm/rpmdb/hdrfmt.c 1.4 +1 -1 rpm/rpmdb/rpmrepo.h patch -p0 <<'@@ .' Index: rpm/rpmdb/hdrfmt.c $ cvs diff -u -r1.151 -r1.152 hdrfmt.c --- rpm/rpmdb/hdrfmt.c18 Oct 2010 06:50:05 - 1.151 +++ rpm/rpmdb/hdrfmt.c25 Jan 2011 18:11:53 - 1.152 @@ -1768,7 +1768,7 @@ * Convert tag string to UUID. * @param he tag container * @param av parameter list (or NULL) - * @praram version UUID version + * @param versionUUID version * @retval val UUID string * @return 0 on success */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmrepo.h $ cvs diff -u -r1.3 -r1.4 rpmrepo.h --- rpm/rpmdb/rpmrepo.h 27 Sep 2010 23:12:43 - 1.3 +++ rpm/rpmdb/rpmrepo.h 25 Jan 2011 18:11:53 - 1.4 @@ -233,7 +233,7 @@ /** * Return realpath(3) canonicalized absolute path. * @param lpath file path - * @retrun canonicalized absolute path + * @return canonicalized absolute path */ /*@null@*/ const char * rpmrepoRealpath(const char * lpath) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ hdrfmt.c rpmrepo.h
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: 25-Jan-2011 19:12:23 Branch: rpm-5_4 Handle: 2011012518122200 Modified files: (Branch: rpm-5_4) rpm/rpmdb hdrfmt.c rpmrepo.h Log: fix typos in doxygen doc Summary: RevisionChanges Path 1.151.2.1 +1 -1 rpm/rpmdb/hdrfmt.c 1.3.2.1 +1 -1 rpm/rpmdb/rpmrepo.h patch -p0 <<'@@ .' Index: rpm/rpmdb/hdrfmt.c $ cvs diff -u -r1.151 -r1.151.2.1 hdrfmt.c --- rpm/rpmdb/hdrfmt.c18 Oct 2010 06:50:05 - 1.151 +++ rpm/rpmdb/hdrfmt.c25 Jan 2011 18:12:22 - 1.151.2.1 @@ -1768,7 +1768,7 @@ * Convert tag string to UUID. * @param he tag container * @param av parameter list (or NULL) - * @praram version UUID version + * @param versionUUID version * @retval val UUID string * @return 0 on success */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmrepo.h $ cvs diff -u -r1.3 -r1.3.2.1 rpmrepo.h --- rpm/rpmdb/rpmrepo.h 27 Sep 2010 23:12:43 - 1.3 +++ rpm/rpmdb/rpmrepo.h 25 Jan 2011 18:12:22 - 1.3.2.1 @@ -233,7 +233,7 @@ /** * Return realpath(3) canonicalized absolute path. * @param lpath file path - * @retrun canonicalized absolute path + * @return canonicalized absolute path */ /*@null@*/ const char * rpmrepoRealpath(const char * lpath) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/rpmdb/ hdrfmt.c rpmrepo.h
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: 25-Jan-2011 19:13:15 Branch: rpm-5_3 Handle: 2011012518131401 Modified files: (Branch: rpm-5_3) rpm/rpmdb hdrfmt.c rpmrepo.h Log: fix typos in doxygen doc Summary: RevisionChanges Path 1.145.2.6 +1 -1 rpm/rpmdb/hdrfmt.c 1.1.2.3 +1 -1 rpm/rpmdb/rpmrepo.h patch -p0 <<'@@ .' Index: rpm/rpmdb/hdrfmt.c $ cvs diff -u -r1.145.2.5 -r1.145.2.6 hdrfmt.c --- rpm/rpmdb/hdrfmt.c18 Oct 2010 06:49:28 - 1.145.2.5 +++ rpm/rpmdb/hdrfmt.c25 Jan 2011 18:13:14 - 1.145.2.6 @@ -1768,7 +1768,7 @@ * Convert tag string to UUID. * @param he tag container * @param av parameter list (or NULL) - * @praram version UUID version + * @param versionUUID version * @retval val UUID string * @return 0 on success */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmrepo.h $ cvs diff -u -r1.1.2.2 -r1.1.2.3 rpmrepo.h --- rpm/rpmdb/rpmrepo.h 27 Sep 2010 23:34:49 - 1.1.2.2 +++ rpm/rpmdb/rpmrepo.h 25 Jan 2011 18:13:15 - 1.1.2.3 @@ -233,7 +233,7 @@ /** * Return realpath(3) canonicalized absolute path. * @param lpath file path - * @retrun canonicalized absolute path + * @return canonicalized absolute path */ /*@null@*/ const char * rpmrepoRealpath(const char * lpath) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ pythoneggs.py
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: 25-Jan-2011 22:47:43 Branch: HEAD Handle: 2011012521474200 Modified files: rpm/scripts pythoneggs.py Log: sync with mandriva version Summary: RevisionChanges Path 1.2 +126 -29rpm/scripts/pythoneggs.py patch -p0 <<'@@ .' Index: rpm/scripts/pythoneggs.py $ cvs diff -u -r1.1 -r1.2 pythoneggs.py --- rpm/scripts/pythoneggs.py 19 Oct 2010 02:46:52 - 1.1 +++ rpm/scripts/pythoneggs.py 25 Jan 2011 21:47:42 - 1.2 @@ -1,20 +1,30 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright 2010 Per ÃÂyvind Karlsen +# +# This program is free software. It may be redistributed and/or modified under +# the terms of the LGPL version 2.1 (or later). +# +# RPM5 python (egg) dependency generator. +# + from getopt import getopt -from os.path import basename, dirname, splitext +from os.path import basename, dirname, isdir, sep, splitext from sys import argv, stdin, version -from pkg_resources import PathMetadata, Distribution +from pkg_resources import Distribution, FileMetadata, PathMetadata from distutils.sysconfig import get_python_lib -opts, args = getopt(argv[1:], 'hPRSECO', -['help', 'provides', 'requires', 'suggests', 'enhances', 'conflicts', 'obsoletes']) +opts, args = getopt(argv[1:], 'hPRSCOE', +['help', 'provides', 'requires', 'suggests', 'conflicts', 'obsoletes', 'extras']) Provides = False Requires = False Suggests = False -Enhances = False Conflicts = False Obsoletes = False +Extras = False for o, a in opts: if o in ('-h', '--help'): @@ -22,9 +32,9 @@ print '-P, --provides\tPrint Provides' print '-R, --requires\tPrint Requires' print '-S, --suggests\tPrint Suggests' -print '-E, --enhances\tPrint Enhances (unused)' print '-C, --conflicts\tPrint Conflicts' print '-O, --obsoletes\tPrint Obsoletes (unused)' +print '-E, --extras\tPrint Extras ' exit(1) elif o in ('-P', '--provides'): Provides = True @@ -32,32 +42,76 @@ Requires = True elif o in ('-S', '--suggests'): Suggests = True -elif o in ('-E', '--enhances'): -Enhances = True elif o in ('-C', '--conflicts'): Conflicts = True elif o in ('-O', '--obsoletes'): Obsoletes = True +elif o in ('-E', '--extras'): +Extras = True -Version = version[:3] -for f in stdin.readlines(): +if Requires: +py_abi = True +else: +py_abi = False +py_deps = {} +if args: +files = args +else: +files = stdin.readlines() +for f in files: f = f.strip() -# FIXME: get other versions as well... -if Provides: -if "/usr/lib/libpython%s.so" % Version in f or \ -"/usr/lib64/libpython%s.so" % Version in f: -print "python(abi) == %s" % Version -if Requires: -if get_python_lib(plat_specific=1) in f or get_python_lib() in f: -print "python(abi) >= %s" % Version -if f.endswith('.egg') or f.endswith('.egg-info') or f.endswith('.egg-link'): -base_dir = dirname(f) -metadata = PathMetadata(base_dir, f) -dist_name = splitext(basename(f))[0] -dist = Distribution(base_dir,project_name=dist_name,metadata=metadata) +lower = f.lower() +name = 'python(abi)' +# add dependency based on path, versioned if within versioned python directory +if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')): +if not name in py_deps: +py_deps[name] = [] +purelib = get_python_lib(standard_lib=1, plat_specific=0).split(version[:3])[0] +platlib = get_python_lib(standard_lib=1, plat_specific=1).split(version[:3])[0] +for lib in (purelib, platlib): +if lib in f: +spec = ('==',f.split(lib)[1].split(sep)[0]) +if not spec in py_deps[name]: +py_deps[name].append(spec) +# Determine provide, requires, conflicts & suggests based on egg metadata +if lower.endswith('.egg') or \ +lower.endswith('.egg-info') or \ +lower.endswith('.egg-link'): +dist_name = basename(f) +if isdir(f): +path_ite
[CVS] RPM: rpm-5_4: rpm/scripts/ pythoneggs.py
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: 25-Jan-2011 22:54:40 Branch: rpm-5_4 Handle: 2011012521544000 Modified files: (Branch: rpm-5_4) rpm/scripts pythoneggs.py Log: sync with mandriva version Summary: RevisionChanges Path 1.1.2.1 +126 -29rpm/scripts/pythoneggs.py patch -p0 <<'@@ .' Index: rpm/scripts/pythoneggs.py $ cvs diff -u -r1.1 -r1.1.2.1 pythoneggs.py --- rpm/scripts/pythoneggs.py 19 Oct 2010 02:46:52 - 1.1 +++ rpm/scripts/pythoneggs.py 25 Jan 2011 21:54:40 - 1.1.2.1 @@ -1,20 +1,30 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright 2010 Per ÃÂyvind Karlsen +# +# This program is free software. It may be redistributed and/or modified under +# the terms of the LGPL version 2.1 (or later). +# +# RPM5 python (egg) dependency generator. +# + from getopt import getopt -from os.path import basename, dirname, splitext +from os.path import basename, dirname, isdir, sep, splitext from sys import argv, stdin, version -from pkg_resources import PathMetadata, Distribution +from pkg_resources import Distribution, FileMetadata, PathMetadata from distutils.sysconfig import get_python_lib -opts, args = getopt(argv[1:], 'hPRSECO', -['help', 'provides', 'requires', 'suggests', 'enhances', 'conflicts', 'obsoletes']) +opts, args = getopt(argv[1:], 'hPRSCOE', +['help', 'provides', 'requires', 'suggests', 'conflicts', 'obsoletes', 'extras']) Provides = False Requires = False Suggests = False -Enhances = False Conflicts = False Obsoletes = False +Extras = False for o, a in opts: if o in ('-h', '--help'): @@ -22,9 +32,9 @@ print '-P, --provides\tPrint Provides' print '-R, --requires\tPrint Requires' print '-S, --suggests\tPrint Suggests' -print '-E, --enhances\tPrint Enhances (unused)' print '-C, --conflicts\tPrint Conflicts' print '-O, --obsoletes\tPrint Obsoletes (unused)' +print '-E, --extras\tPrint Extras ' exit(1) elif o in ('-P', '--provides'): Provides = True @@ -32,32 +42,76 @@ Requires = True elif o in ('-S', '--suggests'): Suggests = True -elif o in ('-E', '--enhances'): -Enhances = True elif o in ('-C', '--conflicts'): Conflicts = True elif o in ('-O', '--obsoletes'): Obsoletes = True +elif o in ('-E', '--extras'): +Extras = True -Version = version[:3] -for f in stdin.readlines(): +if Requires: +py_abi = True +else: +py_abi = False +py_deps = {} +if args: +files = args +else: +files = stdin.readlines() +for f in files: f = f.strip() -# FIXME: get other versions as well... -if Provides: -if "/usr/lib/libpython%s.so" % Version in f or \ -"/usr/lib64/libpython%s.so" % Version in f: -print "python(abi) == %s" % Version -if Requires: -if get_python_lib(plat_specific=1) in f or get_python_lib() in f: -print "python(abi) >= %s" % Version -if f.endswith('.egg') or f.endswith('.egg-info') or f.endswith('.egg-link'): -base_dir = dirname(f) -metadata = PathMetadata(base_dir, f) -dist_name = splitext(basename(f))[0] -dist = Distribution(base_dir,project_name=dist_name,metadata=metadata) +lower = f.lower() +name = 'python(abi)' +# add dependency based on path, versioned if within versioned python directory +if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')): +if not name in py_deps: +py_deps[name] = [] +purelib = get_python_lib(standard_lib=1, plat_specific=0).split(version[:3])[0] +platlib = get_python_lib(standard_lib=1, plat_specific=1).split(version[:3])[0] +for lib in (purelib, platlib): +if lib in f: +spec = ('==',f.split(lib)[1].split(sep)[0]) +if not spec in py_deps[name]: +py_deps[name].append(spec) +# Determine provide, requires, conflicts & suggests based on egg metadata +if lower.endswith('.egg') or \ +lower.endswith('.egg-info') or \ +lower.endswith('.egg-link'): +dist_name = basename(f) +
[CVS] RPM: rpm-5_3: rpm/scripts/ pythoneggs.py
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: 25-Jan-2011 22:56:58 Branch: rpm-5_3 Handle: 2011012521565800 Added files: (Branch: rpm-5_3) rpm/scripts pythoneggs.py Log: add pythonegg() dependency extractor Summary: RevisionChanges Path 1.2.2.2 +180 -0 rpm/scripts/pythoneggs.py patch -p0 <<'@@ .' Index: rpm/scripts/pythoneggs.py $ cvs diff -u -r0 -r1.2.2.2 pythoneggs.py --- /dev/null 2011-01-25 22:55:01.0 +0100 +++ pythoneggs.py 2011-01-25 22:56:58.712436077 +0100 @@ -0,0 +1,180 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright 2010 Per ÃÂyvind Karlsen +# +# This program is free software. It may be redistributed and/or modified under +# the terms of the LGPL version 2.1 (or later). +# +# RPM5 python (egg) dependency generator. +# + +from getopt import getopt +from os.path import basename, dirname, isdir, sep, splitext +from sys import argv, stdin, version +from pkg_resources import Distribution, FileMetadata, PathMetadata +from distutils.sysconfig import get_python_lib + + +opts, args = getopt(argv[1:], 'hPRSCOE', +['help', 'provides', 'requires', 'suggests', 'conflicts', 'obsoletes', 'extras']) + +Provides = False +Requires = False +Suggests = False +Conflicts = False +Obsoletes = False +Extras = False + +for o, a in opts: +if o in ('-h', '--help'): +print '-h, --help\tPrint help' +print '-P, --provides\tPrint Provides' +print '-R, --requires\tPrint Requires' +print '-S, --suggests\tPrint Suggests' +print '-C, --conflicts\tPrint Conflicts' +print '-O, --obsoletes\tPrint Obsoletes (unused)' +print '-E, --extras\tPrint Extras ' +exit(1) +elif o in ('-P', '--provides'): +Provides = True +elif o in ('-R', '--requires'): +Requires = True +elif o in ('-S', '--suggests'): +Suggests = True +elif o in ('-C', '--conflicts'): +Conflicts = True +elif o in ('-O', '--obsoletes'): +Obsoletes = True +elif o in ('-E', '--extras'): +Extras = True + +if Requires: +py_abi = True +else: +py_abi = False +py_deps = {} +if args: +files = args +else: +files = stdin.readlines() +for f in files: +f = f.strip() +lower = f.lower() +name = 'python(abi)' +# add dependency based on path, versioned if within versioned python directory +if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')): +if not name in py_deps: +py_deps[name] = [] +purelib = get_python_lib(standard_lib=1, plat_specific=0).split(version[:3])[0] +platlib = get_python_lib(standard_lib=1, plat_specific=1).split(version[:3])[0] +for lib in (purelib, platlib): +if lib in f: +spec = ('==',f.split(lib)[1].split(sep)[0]) +if not spec in py_deps[name]: +py_deps[name].append(spec) +# Determine provide, requires, conflicts & suggests based on egg metadata +if lower.endswith('.egg') or \ +lower.endswith('.egg-info') or \ +lower.endswith('.egg-link'): +dist_name = basename(f) +if isdir(f): +path_item = dirname(f) +metadata = PathMetadata(path_item, f) +else: +path_item = f +metadata = FileMetadata(f) +dist = Distribution.from_location(path_item, dist_name, metadata) +if Provides: +# If egg metadata says package name is python, we provide python(abi) +if dist.key == 'python': +name = 'python(abi)' +if not name in py_deps: +py_deps[name] = [] +py_deps[name].append(('==', dist.py_version)) +name = 'pythonegg(%s)' % dist.key +if not name in py_deps: +py_deps[name] = [] +if dist.version: +spec = ('==', dist.version) +if not spec in py_deps[name]: +py_deps[name].append(spec) +if Requires or (Suggests and dist.extras): +name = 'python(abi)' +# If egg metadata says package name is python, we don't add dependency on python(abi) +if