From 6ac5f5283340023c78742b01a6f30be52ab24799 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 13:48:50 +0000 Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20unzip-5?= =?UTF-8?q?.42-1.src.rpm=20Mon=20May=2021=202001=20Trond=20Eivind=20Glomsr?= =?UTF-8?q?=F8d=20=20-=205.42=20-=20Don't=20strip=20binari?= =?UTF-8?q?es=20explicitly=20-=20build=20without=20assembly,=20it=20doesn'?= =?UTF-8?q?t=20seem=20to=20increase=20performance=20-=20make=20it=20respec?= =?UTF-8?q?t=20RPM=5FOPT=5FFLAGS,=20define=20=5FGNU=5FSOURCE=20-=20use=20%?= =?UTF-8?q?{=5Ftmppath}=20-=20"License:"=20replaces=20"Copyright:"=20-=20U?= =?UTF-8?q?pdate=20URL=20-=20include=20zipgrep=20-=20COPYING=20doesn't=20e?= =?UTF-8?q?xist=20anymore,=20include=20LICENSE=20instead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- sources | 2 +- unzip.spec | 40 +++++++++++++++++++++----------------- unzip542-rpmoptflags.patch | 11 +++++++++++ 4 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 unzip542-rpmoptflags.patch diff --git a/.cvsignore b/.cvsignore index b91fee0..bae58fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unzip541.tar.gz +unzip542.tar.gz diff --git a/sources b/sources index b9c6875..e8f489d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5fb7ca068da949765abb8c6bc71666e unzip541.tar.gz +4fc23bb7f3fb00ef6af35c5e77ede016 unzip542.tar.gz diff --git a/unzip.spec b/unzip.spec index aa46560..d4c341e 100644 --- a/unzip.spec +++ b/unzip.spec @@ -1,12 +1,13 @@ Summary: A utility for unpacking zip files. Name: unzip -Version: 5.41 -Release: 4 -Copyright: BSD +Version: 5.42 +Release: 1 +License: BSD Group: Applications/Archiving -Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip541.tar.gz -URL: ftp://ftp.info-zip.org/pub/infozip/UnZip.html -BuildRoot: /var/tmp/unzip-root +Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip542.tar.gz +Patch0: unzip542-rpmoptflags.patch +URL: http://www.info-zip.org/pub/infozip/UnZip.html +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The unzip utility is used to list, test, or extract files from a zip @@ -21,35 +22,38 @@ a zip archive. %prep %setup -q +%patch0 -p1 ln -s unix/Makefile Makefile %build -%ifarch i386 -make linux -%else make linux_noasm -%endif %install rm -rf $RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT/usr MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 install -strip $RPM_BUILD_ROOT/usr/bin/{unzip,funzip,unzipsfx} - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc README BUGS COPYING INSTALL -/usr/bin/unzip -/usr/bin/funzip -/usr/bin/unzipsfx -/usr/bin/zipinfo -%{_mandir}/man1/* +%doc README BUGS LICENSE INSTALL +/usr/bin/* +%{_mandir}/*/* %changelog +* Mon May 21 2001 Trond Eivind Glomsrød +- 5.42 +- Don't strip binaries explicitly +- build without assembly, it doesn't seem to increase performance +- make it respect RPM_OPT_FLAGS, define _GNU_SOURCE +- use %%{_tmppath} +- "License:" replaces "Copyright:" +- Update URL +- include zipgrep +- COPYING doesn't exist anymore, include LICENSE instead + * Thu Jul 13 2000 Prospector - automatic rebuild diff --git a/unzip542-rpmoptflags.patch b/unzip542-rpmoptflags.patch new file mode 100644 index 0000000..3b8d8f3 --- /dev/null +++ b/unzip542-rpmoptflags.patch @@ -0,0 +1,11 @@ +--- unzip-5.42/unix/Makefile.rpmoptflags Mon May 21 10:57:51 2001 ++++ unzip-5.42/unix/Makefile Mon May 21 10:58:22 2001 +@@ -735,7 +735,7 @@ + # Linux (Posix, approximately SysV): virtually any version since before 0.96, + # for any platform. Change "-O" to "-O3" or whatever, as desired... + linux_noasm: unix_make +- $(MAKE) unzips CC=gcc LD=gcc CF="-O -Wall -I. $(LOC)" ++ $(MAKE) unzips CC=gcc LD=gcc CF="$(RPM_OPT_FLAGS) -D_GNU_SOURCE -Wall -I. $(LOC)" + + # Linux with lcc compiler: __inline__ (stat.h) not recognized, and must edit + # /usr/include/gnu/types.h to get rid of "long long" if __LCC__ defined. -O3