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: 14-Jul-2003 14:37:46
Branch: HEAD Handle: 2003071413374500
Modified files:
openpkg-src/openpkg HISTORY rc rpmmacros
Log:
add convinience macros %l_rc and %l_rpm; resolve conflict with
openpkg-rc package
Summary:
Revision Changes Path
1.11 +1 -0 openpkg-src/openpkg/HISTORY
1.32 +2 -2 openpkg-src/openpkg/rc
1.37 +2 -0 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.10 -r1.11 HISTORY
--- openpkg-src/openpkg/HISTORY 14 Jul 2003 08:25:34 -0000 1.10
+++ openpkg-src/openpkg/HISTORY 14 Jul 2003 12:37:45 -0000 1.11
@@ -2,6 +2,7 @@
2003
====
+20030714 add convinience macros %l_rc and %l_rpm; resolve conflict with openpkg-rc
package
20030714 bugfix verbose output; add "rc" command to search path for run-command
sections
20030710 rename openpkg_runall to openpkg_rc_all, support new openpkg_rc_def.
20030709 fully work-off rc script
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.31 -r1.32 rc
--- openpkg-src/openpkg/rc 14 Jul 2003 08:25:34 -0000 1.31
+++ openpkg-src/openpkg/rc 14 Jul 2003 12:37:45 -0000 1.32
@@ -26,8 +26,8 @@
# provide hook for "openpkg-rc" package which contains the
# new OSSP rc implementation as a replacement for this script.
-if [ -f @l_prefix@/lib/openpkg/rc ]; then
- exec @l_prefix@/lib/openpkg/rc ${1+"$@"}
+if [ -f @l_prefix@/lib/openpkg/rcng ]; then
+ exec @l_prefix@/lib/openpkg/rcng ${1+"$@"}
fi
# program name, version and date
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.36 -r1.37 rpmmacros
--- openpkg-src/openpkg/rpmmacros 9 Jul 2003 12:42:03 -0000 1.36
+++ openpkg-src/openpkg/rpmmacros 14 Jul 2003 12:37:45 -0000 1.37
@@ -133,6 +133,8 @@
%_tarbin %{l_prefix}/lib/openpkg/tar
# provide fixed paths to tools (additional)
+%l_rc %{l_prefix}/etc/rc
+%l_rpm %{l_prefix}/bin/rpm
%l_rpmtool %{l_prefix}/lib/openpkg/rpmtool
%l_shtool %{l_prefix}/lib/openpkg/shtool
%l_curl %{l_prefix}/lib/openpkg/curl
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
