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:31:46
Branch: HEAD Handle: 2002123014314501
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl openpkg-tool.spec
openpkg-web news.txt
Log:
support new %option(s) stuff
Summary:
Revision Changes Path
1.17 +6 -4 openpkg-src/openpkg-tool/openpkg-build.pl
1.13 +5 -5 openpkg-src/openpkg-tool/openpkg-tool.spec
1.2428 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.16 -r1.17 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 20 Dec 2002 14:54:58 -0000 1.16
+++ openpkg-src/openpkg-tool/openpkg-build.pl 30 Dec 2002 14:31:46 -0000 1.17
@@ -355,10 +355,12 @@
sub parse_options ($) {
my($l) = @_;
- $l = join("\n",@$l) if ref $l;
- return unless $l =~ s/.*Options//;
- my(%with) = $l =~ /--define\s*'(\S+)\s+(\S+?)'/g;
- return \%with;
+ $l = join("\n", @$l) if ref $l;
+ return if ($l !~ m/(--define|%option)/s);
+ my $with = {};
+ $l =~ s/--define\s*'(\S+)\s+(\S+?)'/$with->{$1} = $2, ''/ge; # before
openpkg-20021230
+ $l =~ s/%option\s*(\S+)\s+(\S+)/$with->{$1} = $2, ''/ge; # after
openpkg-20021230
+ return $with;
}
sub override_options ($$$) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 26 Dec 2002 12:42:35 -0000
1.12
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 30 Dec 2002 14:31:46 -0000
1.13
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Bootstrapping
License: GPL
-Version: 20021226
-Release: 20021226
+Version: 20021230
+Release: 20021230
# list of sources
Source0: openpkg.sh
@@ -46,15 +46,15 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20021230
+PreReq: OpenPKG, openpkg >= 20021230
AutoReq: no
AutoReqProv: no
%description
The OpenPKG tool is a helper utility for managing an OpenPKG instance.
- Options: none
+ %options
%prep
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2427 -r1.2428 news.txt
--- openpkg-web/news.txt 30 Dec 2002 14:10:35 -0000 1.2427
+++ openpkg-web/news.txt 30 Dec 2002 14:31:45 -0000 1.2428
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<openpkg-tool-20021230-20021230>
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>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
