OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 03-Jun-2003 18:11:05
Branch: HEAD Handle: 2003060317110202
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl openpkg-index.pl
openpkg-tool.spec
openpkg-web news.txt
Log:
handle package attributes as macros, tolerate Provides: %{name}
Summary:
Revision Changes Path
1.75 +10 -14 openpkg-src/openpkg-tool/openpkg-build.pl
1.17 +13 -7 openpkg-src/openpkg-tool/openpkg-index.pl
1.55 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
1.4709 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.74 -r1.75 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 28 May 2003 11:22:08 -0000 1.74
+++ openpkg-src/openpkg-tool/openpkg-build.pl 3 Jun 2003 16:11:04 -0000 1.75
@@ -817,13 +817,11 @@
defined $_->{with}
} @provides;
- unless (grep($_->{name} eq $name, @provides)) {
- push(@provides, {
- name => $name,
- version => $version,
- release => $release
- });
- }
+ push(@provides, {
+ name => $name,
+ version => $version,
+ release => $release
+ });
$options = %options
? { %options }
@@ -910,13 +908,11 @@
defined $_->{with}
} @provides;
- unless (grep($_->{name} eq $name, @provides)) {
- push(@provides, {
- name => $name,
- version => $version,
- release => $release
- });
- }
+ push(@provides, {
+ name => $name,
+ version => $version,
+ release => $release
+ });
$desc = xel($_->{'Description'});
$options = %options
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-index.pl
============================================================================
$ cvs diff -u -r1.16 -r1.17 openpkg-index.pl
--- openpkg-src/openpkg-tool/openpkg-index.pl 28 Feb 2003 14:22:09 -0000 1.16
+++ openpkg-src/openpkg-tool/openpkg-index.pl 3 Jun 2003 16:11:04 -0000 1.17
@@ -126,7 +126,8 @@
sub vsub ($$) {
my($var,$v) = @_;
- $v =~ s/\%\{([^}]+)\}/exists $var->{$1} ? $var->{$1} : '%{'.$1.'}'/emg;
+ $v =~ s/\%\{([^}]+)\}/
+ exists $var->{$1} ? $var->{$1} : '%{'.$1.'}'/emg;
return $v;
}
@@ -197,7 +198,7 @@
my($s,$ovar) = @_;
my(%evar,%var);
my(@term, $term);
- my(%attr);
+ my(%attr,%avar);
my($l, $v, $cond, $d, $p);
my($re,@defs);
@@ -251,7 +252,7 @@
%var = ();
$cond = '';
foreach $l (split(/\n/, $s)) {
- $v = vsub(\%var,$l);
+ $v = vsub(\%avar, vsub(\%var, $l));
if (($p) = $v =~ /^\#if\s+(.*?)\s*$/) {
#
@@ -360,6 +361,7 @@
# store attribute=value for current condition
#
push @{$attr{$1}->{$cond}}, commasep($1,$2);
+ $avar{lc($1)} = $2 if $cond eq '';
}
}
@@ -972,11 +974,15 @@
xml_head($fh, $opt_r);
foreach $prefix (@ARGV) {
- die "FATAL: $prefix is not a directory\n" unless -d $prefix;
- if ($opt_i) {
- $list = list_rpmdir($prefix);
+ if (-d $prefix) {
+ if ($opt_i) {
+ $list = list_rpmdir($prefix);
+ } else {
+ $list = list_specdir($prefix);
+ }
} else {
- $list = list_specdir($prefix);
+ $list = [ $prefix ];
+ $prefix = dirname($prefix);
}
write_index($fh, $prefix, $opt_r, $opt_p, $list, $opt_C ? \%cache : undef);
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 28 May 2003 11:22:08 -0000
1.54
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 3 Jun 2003 16:11:04 -0000
1.55
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Bootstrapping
License: GPL
-Version: 20030528
-Release: 20030528
+Version: 20030603
+Release: 20030603
# list of sources
Source0: openpkg.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4708 -r1.4709 news.txt
--- openpkg-web/news.txt 3 Jun 2003 15:47:03 -0000 1.4708
+++ openpkg-web/news.txt 3 Jun 2003 16:11:02 -0000 1.4709
@@ -1,3 +1,4 @@
+03-Jun-2003: Upgraded package: P<openpkg-tool-20030603-20030603>
03-Jun-2003: Upgraded package: P<webalizer-2.01.10-20030603>
03-Jun-2003: Upgraded package: P<php-4.3.2-20030603>
03-Jun-2003: Upgraded package: P<apache-1.3.27-20030603>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
