diff options
| -rwxr-xr-x | gendistrib | 24 | ||||
| -rw-r--r-- | rpmtools.spec | 7 |
2 files changed, 21 insertions, 10 deletions
@@ -21,7 +21,7 @@ use URPM; use URPM::Build; my $urpm = new URPM; -my ($noclean, $nohdlists, $nobasefiles, @root, @hdlists) = 0; +my ($noclean, $nohdlists, $nobasefiles, @root, @hdlists) = (0, 0, 0); ($noclean, @ARGV) = @ARGV if $ARGV[0] eq "--noclean"; (undef, @root, @ARGV) = @ARGV if $ARGV[0] eq "--distrib"; @@ -69,7 +69,8 @@ for (0..$#hdlists) { -d "$root/$e->{dir}" or die "unable to find a valid root directory which contains $e->{dir}\n"; print STDERR "parsing rpm files in directory $root/$e->{dir}\n"; - my @headers = $urpm->parse_rpms_build_headers($headers_dir, glob("$root/$e->{dir}/*.rpm")); + my @headers = $urpm->parse_rpms_build_headers(dir => $headers_dir, + rpms => [ glob("$root/$e->{dir}/*.rpm") ]); $e->{headers} = \@headers; } @@ -81,22 +82,29 @@ for (0..$#hdlists) { my $e = $hdlists[$_]; print STDERR "parsing headers for $e->{descr}\n"; - my ($start, $end) = $urpm->parse_headers($headers_dir, @{$e->{headers}}); + my ($start, $end) = $urpm->parse_headers(dir => $headers_dir, + headers => $e->{headers}); print STDERR "computing deps\n"; $urpm->compute_deps; print STDERR "building hdlist for medium \"$e->{descr}\"\n"; - $urpm->build_hdlist($start, $end, $headers_dir, $e->{hdlist}, 9); + $urpm->build_hdlist(start => $start, + end => $end, + dir => $headers_dir, + hdlist => $e->{hdlist}, + ratio => 9); print STDERR "building synthesis for medium \"$e->{descr}\n"; - $urpm->build_synthesis($start, $end, $e->{synthesis}); + $urpm->build_synthesis(start => $start, + end => $end, + synthesis => $e->{synthesis}); } clean_cache(); print STDERR "building base files\n"; -$urpm->build_base_files("$root/Mandrake/base/depslist.ordered", - "$root/Mandrake/base/provides", - "$root/Mandrake/base/compss"); +$urpm->build_base_files(depslist => "$root/Mandrake/base/depslist.ordered", + provides => "$root/Mandrake/base/provides", + compss => "$root/Mandrake/base/compss"); diff --git a/rpmtools.spec b/rpmtools.spec index c446e15..7377afd 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 1mdk +%define release 2mdk # do not modify here, see Makefile in the CVS %define version 4.3 @@ -18,7 +18,7 @@ Group: System/Configuration/Packaging BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} BuildRequires: bzip2-devel gcc perl-devel rpm-devel >= 4.0 -Requires: rpm >= %{rpm_version} bzip2 >= 1.0 perl-URPM >= 0.01 +Requires: rpm >= %{rpm_version} bzip2 >= 1.0 perl-URPM >= 0.02 Obsoletes: rpmtools-compat <= 2.0 rpmtools-devel <= 2.0 %description @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/perl5/man/*/* %changelog +* Mon Jun 3 2002 François Pons <fpons@mandrakesoft.com> 4.3-2mdk +- use perl-URPM >= 0.02 (modified interface). + * Fri May 31 2002 François Pons <fpons@mandrakesoft.com> 4.3-1mdk - gendistrib use now perl-URPM. - keep compatibility with older rpmtools. |