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: 03-Jan-2003 12:09:24 Branch: HEAD Handle: 2003010311092202 Modified files: openpkg-src/openpkg openpkg.spec rpmmacros rpmpopt openpkg-web news.txt Log: switch to new %option implementation Summary: Revision Changes Path 1.121 +2 -2 openpkg-src/openpkg/openpkg.spec 1.27 +3 -3 openpkg-src/openpkg/rpmmacros 1.3 +2 -0 openpkg-src/openpkg/rpmpopt 1.2509 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec ============================================================================ $ cvs diff -u -r1.120 -r1.121 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 3 Jan 2003 10:53:41 -0000 1.120 +++ openpkg-src/openpkg/openpkg.spec 3 Jan 2003 11:09:23 -0000 1.121 @@ -39,8 +39,8 @@ # o any cc(1) # the package version and release -%define V_openpkg 20021230 -%define R_openpkg 20021230 +%define V_openpkg 20030103 +%define R_openpkg 20030103 # the used software versions %define V_rpm 4.0.2 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpmmacros ============================================================================ $ cvs diff -u -r1.26 -r1.27 rpmmacros --- openpkg-src/openpkg/rpmmacros 30 Dec 2002 22:05:34 -0000 1.26 +++ openpkg-src/openpkg/rpmmacros 3 Jan 2003 11:09:24 -0000 1.27 @@ -195,9 +195,9 @@ %ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}} %ifndef() %if %{expand:%%{?%{1}:0}%%{!?%{1}:1}} -# macros for package option handling -%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 for package option configuration +%option() %{expand:%%{!?%{1}:%%global %*}} \ +Provides: %{name}::%{1} = %(echo '%{expand:%%{%{1}}}' | sed -e 's;%%;%%%%;g' -e 's; ;%%20;g' -e 's; ;%%09;g') # 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-src/openpkg/rpmpopt ============================================================================ $ cvs diff -u -r1.2 -r1.3 rpmpopt --- openpkg-src/openpkg/rpmpopt 4 Apr 2002 15:12:03 -0000 1.2 +++ openpkg-src/openpkg/rpmpopt 3 Jan 2003 11:09:24 -0000 1.3 @@ -22,5 +22,7 @@ URL: %-27{URL} Install Time: %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n\ Summary: %{SUMMARY}\n\ Description:\n%{DESCRIPTION}\n\ +Provides:\n\ +[ %{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]\ ' @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.2508 -r1.2509 news.txt --- openpkg-web/news.txt 3 Jan 2003 11:05:50 -0000 1.2508 +++ openpkg-web/news.txt 3 Jan 2003 11:09:22 -0000 1.2509 @@ -1,3 +1,4 @@ +03-Jan-2003: Upgraded package: P<openpkg-20030103-20030103> 03-Jan-2003: New package: P<openssh-3.5p1-20030103> 03-Jan-2003: Upgraded package: P<openpkg-tool-20030103-20030103> 03-Jan-2003: Upgraded package: P<perl-5.8.0-20030103> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]