Accepting request 48470 from home:vuntz:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/48470
OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=12

gzip.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gzip (Version 1.3.13)
+# spec file for package gzip (Version 1.4)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,10 +21,9 @@ Name:           gzip
 Url:            http://www.gzip.org/
 License:        GPLv2+
 Group:          Productivity/Archiving/Compression
-AutoReqProv:    on
 PreReq:         %{install_info_prereq}
-Version:        1.3.13
-Release:        2
+Version:        1.4
+Release:        1
 Summary:        GNU Zip Compression Utilities
 Source:         %{name}-%{version}.tar.gz
 Patch:          zgrep.diff
@@ -33,9 +32,6 @@ Patch2:         zmore.diff
 Patch3:         non-exec-stack.diff
 Patch4:         http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff
 Patch6:         zdiff.diff
-#CVE-2010-0001 integer overflow could lead to array index error in  archives, compressed with
-#the (LZW) compression algorithm
-Patch8:         gzip-CVE-2010-0001.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -44,12 +40,6 @@ Whenever possible, each file is replaced by one with the extension .gz,
 while keeping the same ownership modes and access and modification
 times.
 
-
-
-Authors:
---------
-    Jean-loup Gailly	<gzip@prep.ai.mit.edu>
-
 %prep
 %setup -q
 %patch
@@ -58,13 +48,11 @@ Authors:
 %patch3
 %patch4 -p1
 %patch6
-%patch8 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer \
 -W -Wall -Wno-unused-parameter -Wstrict-prototypes -Wpointer-arith"
-./configure CFLAGS="$CFLAGS" \
-  --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir}
+%configure
 profile_gzip()
 {
   tmpfile=$(mktemp)
@@ -94,18 +82,18 @@ for i in 1 2 3 4 5 6 7 8 9; do
 done
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
 mkdir -p $RPM_BUILD_ROOT/bin
-mv $RPM_BUILD_ROOT/usr/bin/{gzip,gunzip,zcat} $RPM_BUILD_ROOT/bin
-sed -i 's:/usr/bin:/bin:' $RPM_BUILD_ROOT/bin/{gunzip,zcat}
-ln -sf /bin/gzip /bin/gunzip /bin/zcat $RPM_BUILD_ROOT/usr/bin
-ln -sf zmore $RPM_BUILD_ROOT/usr/bin/zless
+mv $RPM_BUILD_ROOT%{_bindir}/{gzip,gunzip,zcat} $RPM_BUILD_ROOT/bin
+sed -i 's:%{_bindir}:/bin:' $RPM_BUILD_ROOT/bin/{gunzip,zcat}
+ln -sf /bin/gzip /bin/gunzip /bin/zcat $RPM_BUILD_ROOT%{_bindir}
+ln -sf zmore $RPM_BUILD_ROOT%{_bindir}/zless
 ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
 
 %files
 %defattr(-, root, root)
 /bin/*
-/usr/bin/*
+%{_bindir}/*
 %doc README AUTHORS ChangeLog TODO NEWS THANKS
 %doc %{_infodir}/*.gz
 %doc %{_mandir}/man*/*.gz