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 Date: 15-Jan-2003 14:45:44
Branch: HEAD Handle: 2003011513454300
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl openpkg-tool.spec
Log:
avoid duplicates in dependency list, sort dependency list, push back
requirement to OpenPKG1.0.0
Summary:
Revision Changes Path
1.36 +2 -5 openpkg-src/openpkg-tool/openpkg-build.pl
1.26 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.35 -r1.36 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 15 Jan 2003 12:56:31 -0000 1.35
+++ openpkg-src/openpkg-tool/openpkg-build.pl 15 Jan 2003 13:45:43 -0000 1.36
@@ -1562,8 +1562,6 @@
: ( )
} @list;
- @out = @list;
-
#
# recurse over dependencies
#
@@ -1573,6 +1571,7 @@
next if $env->{builddeps}->{$_->{name}};
$env->{builddeps}->{$_->{name}} = 1;
+ push @out, $_;
$list = build_deps($_->{name}, $env);
push @out, @$list;
}
@@ -1849,9 +1848,7 @@
sub print_deps ($) {
my($list) = @_;
- foreach (@$list) {
- print vsn($_),"\n";
- }
+ print join("\n", sort map { vsn($_) } @$list),"\n";
}
#######################################################################
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 15 Jan 2003 12:15:46 -0000
1.25
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 15 Jan 2003 13:45:43 -0000
1.26
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021230
-PreReq: OpenPKG, openpkg >= 20021230
+BuildPreReq: OpenPKG, openpkg >= 1.0.0
+PreReq: OpenPKG, openpkg >= 1.0.0
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
