From 2548980cfb11b3e9d82a11ef23e0ab91f59466fc Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 16 Feb 2015 02:35:57 +1000 Subject: [PATCH] Spec cleanup --- bzip2.spec | 182 ++++++++++++----------------------------------------- 1 file changed, 39 insertions(+), 143 deletions(-) diff --git a/bzip2.spec b/bzip2.spec index 2d0d8f2..cca97a6 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -1,29 +1,29 @@ %define major 1 %define libname %mklibname %{name}_ %{major} -%define develname %mklibname %{name} -d +%define devname %mklibname %{name} -d -%define buildpdf 0 +%bcond_with pdf Summary: Extremely powerful file compression utility Name: bzip2 Version: 1.0.6 -Release: 6 +Release: 9 License: BSD Group: Archiving/Compression -URL: http://www.bzip.org/index.html +Url: http://www.bzip.org/index.html Source0: http://www.bzip.org/%{version}/%{name}-%{version}.tar.gz Source1: bzgrep Source2: bzme Source3: bzme.1 Patch0: bzip2-1.0.6-makefile.diff -Requires: mktemp -Requires: %{libname} = %{version}-%{release} -%if %{buildpdf} +BuildRequires: libtool +BuildRequires: texinfo +%if %{with pdf} BuildRequires: tetex-dvips BuildRequires: tetex-latex %endif -BuildRequires: texinfo -BuildRequires: libtool +Requires: mktemp +Requires: %{libname} = %{EVRD} %description Bzip2 compresses files using the Burrows-Wheeler block-sorting text @@ -35,26 +35,49 @@ compressors. The command-line options are deliberately very similar to those of GNU Gzip, but they are not identical. +%files +%doc README LICENSE CHANGES +%{_bindir}/* +%{_mandir}/man1/* + +#---------------------------------------------------------------------------- + %package -n %{libname} Summary: Libraries for developing apps which will use bzip2 Group: System/Libraries -%description -n %{libname} +%description -n %{libname} Library of bzip2 functions, for developing apps which will use the bzip2 library (aka libz2). -%package -n %{develname} +%files -n %{libname} +%doc LICENSE +%{_libdir}/libbz2.so.%{major}* + +#---------------------------------------------------------------------------- + +%package -n %{devname} Summary: Header files for developing apps which will use bzip2 Group: Development/C -Requires: %{libname} = %{version}-%{release} -Provides: lib%{name}-devel = %{version}-%{release} -Provides: %{name}-devel = %{version}-%{release} +Requires: %{libname} = %{EVRD} +Provides: lib%{name}-devel = %{EVRD} +Provides: %{name}-devel = %{EVRD} Obsoletes: %{mklibname bzip2_ 1 -d} < 1.0.5-3 -%description -n %{develname} +%description -n %{devname} Header files and static library of bzip2 functions, for developing apps which will use the bzip2 library (aka libz2). +%files -n %{devname} +%doc *.html LICENSE +%if %{with pdf} +%doc manual.pdf +%endif +%{_libdir}/libbz2.so +%{_includedir}/*.h + +#---------------------------------------------------------------------------- + %prep %setup -q %patch0 -p1 -b .makefile @@ -71,7 +94,7 @@ cp %{SOURCE3} bzme.1 %make -f Makefile-libbz2_so %make -%if %{buildpdf} +%if %{with pdf} texi2dvi --pdf manual.texi %endif @@ -92,130 +115,3 @@ install -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1/ # cleanup rm -f %{buildroot}%{_libdir}/*.a -%files -%doc README LICENSE CHANGES -%{_bindir}/* -%{_mandir}/man1/* - -%files -n %{libname} -%doc LICENSE -%{_libdir}/libbz2.so.%{major}* - -%files -n %{develname} -%doc *.html LICENSE -%if %{buildpdf} -%doc manual.pdf -%endif -%{_libdir}/libbz2.so -%{_includedir}/*.h - - -%changelog -* Sat Feb 11 2012 Oden Eriksson 1.0.6-4 -+ Revision: 773295 -- various cleanups - -* Tue May 03 2011 Oden Eriksson 1.0.6-3 -+ Revision: 663345 -- mass rebuild - -* Fri Oct 15 2010 Thierry Vignaud 1.0.6-2mdv2011.0 -+ Revision: 585829 -- bzme: able to recompress rar files too -- bzme: adapt for Fedora/RHEL - -* Mon Sep 20 2010 Oden Eriksson 1.0.6-1mdv2011.0 -+ Revision: 579942 -- 1.0.6 -- rediffed P0 - -* Sun Mar 14 2010 Oden Eriksson 1.0.5-7mdv2010.1 -+ Revision: 518988 -- rebuild - -* Sun Aug 09 2009 Oden Eriksson 1.0.5-6mdv2010.0 -+ Revision: 413193 -- rebuild - -* Sat Jan 10 2009 Tomasz Pawel Gajc 1.0.5-5mdv2009.1 -+ Revision: 328087 -- merge both patches into one -- make sure that -D_FILE_OFFSET_BITS=64 is always passed during compilation (mdvbz #46851) - -* Sat Dec 20 2008 Oden Eriksson 1.0.5-4mdv2009.1 -+ Revision: 316557 -- use -fPIC -- really use %%{optflags} and %%{ldflags} - -* Sun Jul 06 2008 Tomasz Pawel Gajc 1.0.5-3mdv2009.0 -+ Revision: 232090 -- new library policy -- protect major -- spec file clean - -* Mon Jun 16 2008 Thierry Vignaud 1.0.5-2mdv2009.0 -+ Revision: 220495 -- rebuild - - + Pixel - - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers - -* Fri Mar 21 2008 Gustavo De Nardin 1.0.5-1mdv2008.1 -+ Revision: 189334 -- new version, 1.0.5, fixes a security hole - -* Fri Jan 11 2008 Thierry Vignaud 1.0.4-3mdv2008.1 -+ Revision: 149066 -- rebuild -- kill re-definition of %%buildroot on Pixel's request - - + Olivier Blin - - restore BuildRoot - -* Thu Aug 16 2007 Thierry Vignaud 1.0.4-2mdv2008.0 -+ Revision: 64221 -- rebuild - - -* Fri Jan 05 2007 Oden Eriksson 1.0.4-1mdv2007.0 -+ Revision: 104592 -- 1.0.4 -- rediffed the makefile patch (now P0) -- nuked upstream fixes for CAN-2005-0953, CAN-2005-0758 and other sec holes -- rebuild -- Import bzip2 - -* Sun Jul 30 2006 Oden Eriksson 1.0.3-6mdk -- sync with fedora (1.0.3-2.2.1) -- dropped the progress patch (P2) because it don't work with - large files, fixes #22262 - -* Sat May 13 2006 Stefan van der Eijk 1.0.3-5mdk -- rebuild for sparc - -* Tue Jan 31 2006 Oden Eriksson 1.0.3-4mdk -- merge with the 1.0.3-1.2.20060mdk relese (CVE-2005-0953,CVE-2005-0758) - -* Sat Jan 07 2006 Christiaan Welvaart 1.0.3-3mdk -- add BuildRequires: libtool - -* Sat Dec 31 2005 Mandriva Linux Team 1.0.3-2mdk -- Rebuild - -* Wed Jun 08 2005 Götz Waschk 1.0.3-1mdk -- update patch 1 -- fix URLs -- new version - -* Fri Feb 11 2005 Olivier Blin 1.0.2-20mdk -- bzme: allow to force compression with -F option - (#11183, patch from Michael Scherer) -- fix summary ended with dot - -* Fri Sep 17 2004 Gwenole Beauchesne 1.0.2-19mdk -- ship with bzdiff, bzmore -- automake build is evil here for a so small project - -* Tue Apr 06 2004 Thierry Vignaud 1.0.2-18mdk -- fix url -