OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Aug-2003 13:08:53
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082312085201
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg TODO openpkg.spec rpm.patch.feature
Log:
get our rpmx stuff working again by re-activating old POPT behaviour
Summary:
Revision Changes Path
1.1.2.3 +1 -1 openpkg-src/openpkg/TODO
1.192.2.8 +1 -1 openpkg-src/openpkg/openpkg.spec
1.4.2.2 +17 -1 openpkg-src/openpkg/rpm.patch.feature
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/TODO
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 TODO
--- openpkg-src/openpkg/TODO 23 Aug 2003 08:32:25 -0000 1.1.2.2
+++ openpkg-src/openpkg/TODO 23 Aug 2003 11:08:52 -0000 1.1.2.3
@@ -3,7 +3,7 @@
Feel free to pick up an item and fix it!
TO DO:
-- rse: "rpm --fetch <arg>" now says "rpm: --fetch requires an argument"
+- <NONE>
SHOULD DO:
- rse: "mkdir -f" error on RPM configure run (continues, but is nasty)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.7 -r1.192.2.8 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 23 Aug 2003 07:53:54 -0000 1.192.2.7
+++ openpkg-src/openpkg/openpkg.spec 23 Aug 2003 11:08:52 -0000 1.192.2.8
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030822
+%define V_openpkg 20030823
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.4.2.1 -r1.4.2.2 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 22 Aug 2003 10:57:07 -0000 1.4.2.1
+++ openpkg-src/openpkg/rpm.patch.feature 23 Aug 2003 11:08:53 -0000 1.4.2.2
@@ -485,7 +485,7 @@
# \endverbatim
#*/
+---------------------------------------------------------------------------
-+ re-enable legacy CLI behaviour
+| re-enable legacy CLI behaviour
+---------------------------------------------------------------------------
--- rpmpopt.in.dist 2003-08-18 16:31:50.000000000 +0200
+++ rpmpopt.in 2003-08-18 16:33:18.000000000 +0200
@@ -538,3 +538,19 @@
rpm exec --initdb rpmd --initdb
rpm exec --rebuilddb rpmd --rebuilddb
++---------------------------------------------------------------------------
+| re-enable legacy POPT behaviour of passing an extra "--" argument
+| to the executed commands (which allows the commands to do easier parsing)
++---------------------------------------------------------------------------
+--- popt/popt.c.orig Thu Aug 22 18:34:48 2002
++++ popt/popt.c Sat Aug 23 13:06:05 2003
+@@ -400,9 +400,7 @@
+ }
+
+ if (con->leftovers != NULL && con->numLeftovers > 0) {
+-#if 0
+ argv[argc++] = "--";
+-#endif
+ memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
+ argc += con->numLeftovers;
+ }
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
