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: 30-Dec-2002 16:49:25 Branch: HEAD Handle: 2002123015492500 Modified files: openpkg-src/openpkg rpmmacros Log: macro processing is a black art -- just don't ask, you don't really want to know what this fixes Summary: Revision Changes Path 1.25 +1 -1 openpkg-src/openpkg/rpmmacros ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpmmacros ============================================================================ $ cvs diff -u -r1.24 -r1.25 rpmmacros --- openpkg-src/openpkg/rpmmacros 30 Dec 2002 14:10:36 -0000 1.24 +++ openpkg-src/openpkg/rpmmacros 30 Dec 2002 15:49:25 -0000 1.25 @@ -196,7 +196,7 @@ %ifndef() %if %{expand:%%{?%{1}:0}%%{!?%{1}:1}} # macros for package option handling -%option() %{expand:%%{!?%{1}:%%global %{1} %{2}}%%global _options %%{?_options:%%{_options}&}%{1}=%%{%{1}}} +%option() %{expand:%%{!?%{1}:%%global %*}%%global _options %%{?_options:%%{_options}&}%{1}=%%{%{1}}} %options(p:) %(echo "Package Options:"; opts=`echo "%{?_options:%{_options}}"`; if [ ".$opts" = . ]; then echo " (none)"; else IFS="&"; for opt in $opts; do eval `echo $opt | sed -e 's/^\\(.*\\)=\\(.*\\)$/name="\\1"; value="\\2"/'`; echo dummy | awk '{ printf(" %%%%option %%-%{?-p:%{-p*}}s %%s\\n", name, value); }' name="$name" value="$value"; done; fi) # macro-processor add-on for testing external conditions @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]