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: 27-Apr-2004 10:35:46
Branch: HEAD Handle: 2004042709354501
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmpopt
Log:
fixed rpmpopt: replace hard-coded bash path and do not use reserved
shell keywords
Summary:
Revision Changes Path
1.167 +1 -0 openpkg-src/openpkg/HISTORY
1.321 +1 -1 openpkg-src/openpkg/openpkg.spec
1.19 +3 -3 openpkg-src/openpkg/rpmpopt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.166 -r1.167 HISTORY
--- openpkg-src/openpkg/HISTORY 26 Apr 2004 18:15:58 -0000 1.166
+++ openpkg-src/openpkg/HISTORY 27 Apr 2004 08:35:45 -0000 1.167
@@ -2,6 +2,7 @@
2004
====
+20040427 fixed rpmpopt: replace hard-coded bash path and do not use reserved shell
keywords
20040426 upgrade to cURL 7.11.2
20040422 backout added hack to "rpmtool cflags -O" processing because it was
incorrect
20040421 add hack to "rpmtool cflags -O" processing because Tru64 doesn't know
plain "-O" option
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.320 -r1.321 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 26 Apr 2004 18:15:58 -0000 1.320
+++ openpkg-src/openpkg/openpkg.spec 27 Apr 2004 08:35:45 -0000 1.321
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040426
+%define V_openpkg 20040427
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmpopt
============================================================================
$ cvs diff -u -r1.18 -r1.19 rpmpopt
--- openpkg-src/openpkg/rpmpopt 14 Apr 2004 15:13:14 -0000 1.18
+++ openpkg-src/openpkg/rpmpopt 27 Apr 2004 08:35:46 -0000 1.19
@@ -79,7 +79,7 @@
# RPM extension: "rpm --test"
rpm alias --test -q --qf '%{TEST}\n' \
- --pipe "grep -v \(none\) | /openpkg-dev/lib/openpkg/bash" \
+ --pipe "grep -v \(none\) | @l_prefix@/lib/openpkg/bash" \
--POPTdesc=$"run package run-time test script (%test)"
# RPM adjustment: "rpm --setperms ..."
@@ -90,8 +90,8 @@
# RPM adjustment: "rpm --setugids ..."
rpm alias --setugids -q --qf \
- '[do %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape}
%{FILENAMES:shescape}\n]' \
- --pipe "(echo 'do () { chown -- \"$1\" \"$3\"; chgrp -- \"$2\" \"$3\"; }'; grep
-v '(none)') | @l_prefix@/lib/openpkg/bash" \
+ '[run %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape}
%{FILENAMES:shescape}\n]' \
+ --pipe "(echo 'run () { chown -- \"$1\" \"$3\"; chgrp -- \"$2\" \"$3\"; }';
grep -v '(none)') | @l_prefix@/lib/openpkg/bash" \
--POPTdesc=$"set user/group ownership of files in a package"
# RPM adjustment: improved and cleaned up "rpm -i/--info"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
