From 85790f08a5e99dfec89054b3ec3eb39149dd0f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= Date: Mon, 24 May 2010 08:32:39 +0000 Subject: [PATCH] spec file cleanup --- unzip.spec | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/unzip.spec b/unzip.spec index 73cf912..2d6d83d 100644 --- a/unzip.spec +++ b/unzip.spec @@ -1,11 +1,10 @@ Summary: A utility for unpacking zip files Name: unzip Version: 6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Archiving Source: http://downloads.sourceforge.net/infozip/unzip60.tar.gz - # Not sent to upstream. Patch1: unzip-6.0-bzip2-configure.patch # Upstream plans to do this in zip (hopefully also in unzip). @@ -18,9 +17,7 @@ Patch4: unzip-6.0-attribs-overflow.patch # Not sent to upstream, as it's Fedora/RHEL specific. # Modify the configure script not to request the strip of binaries. Patch5: unzip-6.0-nostrip.patch - URL: http://www.info-zip.org/UnZip.html -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel %description @@ -49,16 +46,18 @@ make -f unix/Makefile CF_NOOPT="-I. -DUNIX $RPM_OPT_FLAGS" generic_gcc %{?_smp_m rm -rf $RPM_BUILD_ROOT make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 INSTALL="cp -p" install -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) -%doc README BUGS LICENSE +%doc README BUGS LICENSE %{_bindir}/* %{_mandir}/*/* %changelog +* Mon May 24 2010 Karel Klic - 6.0-3 +- Removed BuildRoot tag +- Removed %%clean section +- Removed trailing whitespaces in the spec file + * Mon Nov 30 2009 Karel Klic - 6.0-2 - Fixed a buffer overflow (rhbz#532380, unzip-6.0-attribs-overflow.patch) - Generate debuginfos (rhbz#540220, unzip-6.0-nostrip.patch) @@ -66,19 +65,19 @@ rm -rf $RPM_BUILD_ROOT * Mon Nov 16 2009 Karel Klic - 6.0-1 - New upstream version - Compiled using `make generic_gcc` (includes asm) -- Removed unzip542-rpmoptflags.patch, because RPM_OPT_FLAGS +- Removed unzip542-rpmoptflags.patch, because RPM_OPT_FLAGS are provided using command line -- Removed unzip-5.51-link-segv.patch, because the link file +- Removed unzip-5.51-link-segv.patch, because the link file is not reopened in the current version -- Removed unzip-5.51-link-segv2.patch, the bug was already fixed +- Removed unzip-5.51-link-segv2.patch, the bug was already fixed in open_outfile in 5.52 -- Removed unzip-5.52-toctou.patch (CAN-2005-2475), the vulnerability +- Removed unzip-5.52-toctou.patch (CAN-2005-2475), the vulnerability is fixed in the current version -- Removed unzip-5.52-near-4GB.patch, unzip-5.52-near-4GB2.patch, - unzip-5.52-4GB3.patch, and unzip-5.52-4GB_types.patch, because +- Removed unzip-5.52-near-4GB.patch, unzip-5.52-near-4GB2.patch, + unzip-5.52-4GB3.patch, and unzip-5.52-4GB_types.patch, because the current version supports large files - Removed unzip-5.52-long-filename.patch, the current version - fixes the vulnerability by checking the length of command line + fixes the vulnerability by checking the length of command line arguments in unzip.c - Removed unzip-5.52-makefile.patch, because we no longer create the link manually @@ -110,10 +109,10 @@ rm -rf $RPM_BUILD_ROOT - fix open call * Wed Feb 7 2007 Ivana Varekova - 5.52-4 -- incorporate the next peckage review comment +- incorporate the next peckage review comment * Tue Feb 6 2007 Ivana Varekova - 5.52-3 -- Resolves: 226516 +- Resolves: 226516 Incorporate the package review * Wed Jul 12 2006 Jesse Keating - 5.52-2.2.1 @@ -139,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT - fix bug 164928 - TOCTOU issue in unzip * Mon May 9 2005 Ivana Varekova 5.51-11 -- fix bug 156959 – invalid file mode on created files +- fix bug 156959 – invalid file mode on created files * Mon Mar 7 2005 Ivana Varekova 5.51-10 - rebuilt @@ -291,7 +290,7 @@ include quote and/or control characters. * 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 +- build without assembly, it doesn't seem to increase performance - make it respect RPM_OPT_FLAGS, define _GNU_SOURCE - use %%{_tmppath} - "License:" replaces "Copyright:" @@ -314,7 +313,7 @@ include quote and/or control characters. * Fri Jul 30 1999 Bill Nottingham - update to 5.40 -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 5) * Thu Dec 17 1998 Michael Maher