Accepting request 380961 from home:scarabeus_iv:branches:Base:System
- Version update to release 1.7: * gzip now accepts the --synchronous option * gzip now accepts the --rsyncable option * The GZIP environment variable is now obsolescent * Installed programs like 'zgrep' now use the PATH environment variable as usual to find subsidiary programs like 'gzip' and 'grep' - Remove obsolete patch tempfile.diff - Remove upstreamed patch gzip-rsyncable.diff - Rebase manpage-no-date.patch to apply to 1.7 version - Rename reproducible.patch to something actually explanatory: * manpage-no-date.patch OBS-URL: https://build.opensuse.org/request/show/380961 OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=42
This commit is contained in:
21
gzip.spec
21
gzip.spec
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: gzip
|
||||
Version: 1.6
|
||||
Version: 1.7
|
||||
Release: 0
|
||||
Summary: GNU Zip Compression Utilities
|
||||
License: GPL-2.0+
|
||||
@@ -27,17 +27,15 @@ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
|
||||
Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
|
||||
Source3: %{name}.keyring
|
||||
Patch0: zgrep.diff
|
||||
Patch1: tempfile.diff
|
||||
Patch2: zmore.diff
|
||||
Patch3: non-exec-stack.diff
|
||||
Patch4: http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff
|
||||
Patch6: zdiff.diff
|
||||
# PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files
|
||||
Patch7: xz_lzma.patch
|
||||
Patch8: reproducible.patch
|
||||
Patch8: manpage-no-date.patch
|
||||
BuildRequires: makeinfo
|
||||
BuildRequires: xz
|
||||
Requires(post): %{install_info_prereq}
|
||||
Requires(post): %{install_info_prereq}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@@ -47,13 +45,10 @@ while keeping the same ownership modes and access and modification
|
||||
times.
|
||||
|
||||
%prep
|
||||
%{?gpg_verify: %gpg_verify %{SOURCE2}}
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3
|
||||
%patch4 -p1
|
||||
%patch6
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
@@ -69,7 +64,7 @@ profile_gzip()
|
||||
{
|
||||
tmpfile=$(mktemp)
|
||||
trap "rm -f $tmpfile $tmpfile.gz" EXIT
|
||||
tar -cf $tmpfile /usr || true
|
||||
tar -cf $tmpfile %{_prefix} || true
|
||||
time ./gzip $tmpfile
|
||||
time ./gzip -d < $tmpfile.gz > /dev/null
|
||||
}
|
||||
@@ -94,7 +89,7 @@ for i in 1 2 3 4 5 6 7 8 9; do
|
||||
done
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
make %{?_smp_mflags} DESTDIR=%{buildroot} install
|
||||
#UsrMerge
|
||||
mkdir -p %{buildroot}/bin
|
||||
ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat %{buildroot}/bin
|
||||
@@ -109,13 +104,13 @@ ln -sf zmore.1 %{buildroot}%{_mandir}/man1/zless.1
|
||||
#EndUsrMerge
|
||||
%{_bindir}/*
|
||||
%doc README AUTHORS ChangeLog TODO NEWS THANKS
|
||||
%doc %{_infodir}/*.gz
|
||||
%doc %{_mandir}/man*/*.gz
|
||||
%{_infodir}/*.*
|
||||
%{_mandir}/man*/*.*
|
||||
|
||||
%post
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
|
||||
|
||||
%postun
|
||||
%preun
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
|
||||
|
||||
%changelog
|
||||
|
Reference in New Issue
Block a user