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 openpkg-web Date: 30-Dec-2002 15:10:37
Branch: HEAD Handle: 2002123014103501
Modified files:
openpkg-src/openpkg openpkg.spec rpmmacros
openpkg-web news.txt
Log:
provide brand-new extensions: %option and %options macros
Summary:
Revision Changes Path
1.117 +2 -2 openpkg-src/openpkg/openpkg.spec
1.24 +4 -0 openpkg-src/openpkg/rpmmacros
1.2427 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.116 -r1.117 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 20 Dec 2002 19:32:28 -0000 1.116
+++ openpkg-src/openpkg/openpkg.spec 30 Dec 2002 14:10:36 -0000 1.117
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 20021218
-%define R_openpkg 20021218
+%define V_openpkg 20021230
+%define R_openpkg 20021230
# the used software versions
%define V_rpm 4.0.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.23 -r1.24 rpmmacros
--- openpkg-src/openpkg/rpmmacros 4 Dec 2002 10:41:18 -0000 1.23
+++ openpkg-src/openpkg/rpmmacros 30 Dec 2002 14:10:36 -0000 1.24
@@ -195,6 +195,10 @@
%ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
%ifndef() %if %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
+# macros for package option handling
+%option() %{expand:%%{!?%{1}:%%global %{1} %{2}}%%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
%l_test(pfd) %(if [ ".%{?-p:yes}" = .yes ]; then %{l_prefix}/bin/rpm -q
%1 >/dev/null 2>&1; rc=$?; elif [ ".%{?-f:yes}" = .yes ]; then test -f %1; rc=$?; elif
[ ".%{?-d:yes}" = .yes ]; then test -d %1; rc=$?; fi; if [ ".$rc" = .0 ]; then echo
"yes"; else echo "no"; fi)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2426 -r1.2427 news.txt
--- openpkg-web/news.txt 30 Dec 2002 11:11:17 -0000 1.2426
+++ openpkg-web/news.txt 30 Dec 2002 14:10:35 -0000 1.2427
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<openpkg-20021230-20021230>
30-Dec-2002: New package: P<orbit2-2.5.1-20021230>
30-Dec-2002: Upgraded package: P<popt-1.7-20021230>
30-Dec-2002: New package: P<libidl-0.8.0-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
