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: 13-Jan-2005 21:57:10
Branch: HEAD Handle: 2005011320570901
Modified files:
openpkg-src/openpkg HISTORY rpmmacros
Log:
add %{l_nil} macro
Summary:
Revision Changes Path
1.235 +1 -0 openpkg-src/openpkg/HISTORY
1.67 +3 -0 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.234 -r1.235 HISTORY
--- openpkg-src/openpkg/HISTORY 13 Jan 2005 10:56:48 -0000 1.234
+++ openpkg-src/openpkg/HISTORY 13 Jan 2005 20:57:09 -0000 1.235
@@ -2,6 +2,7 @@
2004
====
+20050113 add %{l_nil} macro (excluded in 2.2.3)
20050113 upgrade to OSSP uuid 1.1.2 (excluded in 2.2.3)
20041225 upgrade to BeeCrypt 4.1.2 (excluded in 2.2.3)
20041222 upgrade to GNU tar 1.15.1 (excluded in 2.2.3)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.66 -r1.67 rpmmacros
--- openpkg-src/openpkg/rpmmacros 22 Dec 2004 17:49:33 -0000 1.66
+++ openpkg-src/openpkg/rpmmacros 13 Jan 2005 20:57:10 -0000 1.67
@@ -162,6 +162,9 @@
# variables and "-A" for really all variables.
%l_value(sbcaA) %{expand:%(l=""; for x in `if [ ".%*" != . ]; then
echo "%* "; else p=""; if [ ".%{-a:yes}" = .yes ]; then
p="^%%l_(prefix|[smrn](usr|grp|uid|gid))"; elif [ ".%{-A:yes}" = .yes ]; then
p="^%%l_"; fi; if [ ".$p" != . ]; then egrep "$p"
%{l_prefix}/etc/openpkg/rpmmacros | sed -e '/^%%l_value/,$d' -e
's;^%%\\(l_[a-z1-9_]*\\).*;\\1;'; fi; fi`; do e=""; if [ ".%{-s:yes}" = .yes ];
then e="-e 's;@$x@;%%{$x};g'"; elif [ ".%{-b:yes}" = .yes ]; then
e="$x='%%{$x}';"; elif [ ".%{-c:yes}" = .yes ]; then e="set $x = '%%{$x}';";
else e="%%{$x}"; fi; if [ ".$l" = . ]; then l="$e"; else l="$l $e"; fi; done;
echo "$l")}
+# local version of the empty macro
+%l_nil %{nil}
+
# override the internal RPM hierarchy variables
%_usr %{nil}
%_var %{nil}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
