diff options
author | Olivier Thauvin <nanardon@mandriva.org> | 2005-01-03 16:54:41 +0000 |
---|---|---|
committer | Olivier Thauvin <nanardon@mandriva.org> | 2005-01-03 16:54:41 +0000 |
commit | e2c7fbaf56ee05ea3caa85a216f834cd7606fd2e (patch) | |
tree | ac518b68a8f9237e28e92a54f3058972fb6eb4bb | |
parent | d4f28b53147fa97f0f4feddf861804f6d9a8afed (diff) | |
download | rpmtools-e2c7fbaf56ee05ea3caa85a216f834cd7606fd2e.tar rpmtools-e2c7fbaf56ee05ea3caa85a216f834cd7606fd2e.tar.gz rpmtools-e2c7fbaf56ee05ea3caa85a216f834cd7606fd2e.tar.bz2 rpmtools-e2c7fbaf56ee05ea3caa85a216f834cd7606fd2e.tar.xz rpmtools-e2c7fbaf56ee05ea3caa85a216f834cd7606fd2e.zip |
- Fix options parsing
- 5.0.8
-rw-r--r-- | Packdrakeng.pm | 6 | ||||
-rw-r--r-- | rpmtools.spec | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Packdrakeng.pm b/Packdrakeng.pm index 86e3942..0eaa6ed 100644 --- a/Packdrakeng.pm +++ b/Packdrakeng.pm @@ -63,9 +63,11 @@ sub _new { use_extern => 1, # default behaviour, informative only noargs => $options{noargs}, - level => $options{comp_level} || 6, # compression level, aka -X gzip or bzip option + # compression level, aka -X gzip or bzip option + level => defined($options{comp_level}) ? $options{comp_level} : 6, - block_size => $options{block_size} || 400 * 1024, # A compressed block will contain 400k of compressed data + # A compressed block will contain 400k of compressed data + block_size => defined($options{block_size}) ? $options{block_size} : 400 * 1024, bufsize => $options{bufsize} || 65536, # Arbitrary buffer size to read files # Internal data diff --git a/rpmtools.spec b/rpmtools.spec index c9428dc..d40c9bf 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -2,7 +2,7 @@ %define release 1mdk # do not modify here, see Makefile in the CVS -%define version 5.0.7 +%define version 5.0.8 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"') %define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm) @@ -21,6 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} BuildRequires: rpm-devel >= 4.0.3 bzip2-devel BuildRequires: perl-devel +BuildRequires: perl-Compress-Zlib Requires: rpm >= %{rpm_version} bzip2 >= 1.0 perl-URPM >= 0.94 perl-base >= 5.8.4 Conflicts: rpmtools-compat <= 2.0 rpmtools-devel <= 2.0 @@ -74,6 +75,10 @@ is fully compatible with old packdrake. %{_mandir}/*/* %changelog +* Mon Jan 03 2005 Olivier Thauvin <thauvin@aerov.jussieu.fr> 5.0.8-1mdk +- Fix the previous speedup +- BuildRequires perl-Compress-Zlib + * Thu Dec 30 2004 Olivier Thauvin <thauvin@aerov.jussieu.fr> 5.0.7-1mdk - speedup uncompress function |