diff --git a/zlib.spec b/zlib.spec index 690ceba..84829cb 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,25 +1,25 @@ -Summary: The zlib compression and decompression library. +Summary: The zlib compression and decompression library Name: zlib Version: 1.2.3 -Release: 4 +Release: 5%{?dist} Group: System Environment/Libraries -Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz +Source: http://www.zlib.net/zlib-%{version}.tar.gz Patch0: zlib-1.1.4-make-test.patch Patch1: zlib-1.2.3-cflags.patch Patch2: zlib-1.2.3-lib.patch URL: http://www.gzip.org/zlib/ License: BSD Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Zlib is a general-purpose, patent-free, lossless data compression library which is used by many different programs. %package devel -Summary: Header files and libraries for Zlib development. +Summary: Header files and libraries for Zlib development Group: Development/Libraries -Requires: zlib = %{version} +Requires: zlib = %{version}-%{release} %description devel The zlib-devel package contains the header files and libraries needed @@ -36,25 +36,15 @@ library. CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix} mv Makefile Makefile.shared -# now build the static lib +# created Makefile for the static lib CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} mv Makefile Makefile.static %install rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_prefix} -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3 -make -f Makefile.shared install prefix=${RPM_BUILD_ROOT}%{_prefix} -make -f Makefile.static install prefix=${RPM_BUILD_ROOT}%{_prefix} - -install -m644 zutil.h ${RPM_BUILD_ROOT}%{_includedir}/zutil.h - -if [ "%{_prefix}/lib" != "%{_libdir}" ]; then - mkdir -p ${RPM_BUILD_ROOT}%{_libdir} - mv ${RPM_BUILD_ROOT}%{_prefix}/lib/* ${RPM_BUILD_ROOT}%{_libdir} - rmdir ${RPM_BUILD_ROOT}%{_prefix}/lib -fi +make -f Makefile.shared install prefix=${RPM_BUILD_ROOT}%{_prefix} +make -f Makefile.static install prefix=${RPM_BUILD_ROOT}%{_prefix} %check make -f Makefile.shared %{?_smp_mflags} test @@ -68,23 +58,26 @@ rm -rf ${RPM_BUILD_ROOT} %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc README +%defattr(-,root,root,-) +%doc README ChangeLog FAQ %{_libdir}/libz.so.* %files devel -%defattr(-,root,root) -%doc ChangeLog algorithm.txt minigzip.c example.c +%defattr(-,root,root,-) +%doc algorithm.txt minigzip.c example.c %{_libdir}/*.a %{_libdir}/*.so %{_includedir}/* %{_mandir}/man3/zlib.3* %changelog -* Mon Oct 23 2006 Ivana Varekova 1.2.3-4 +* Mon Feb 19 2007 Ivana Varekova - 1.2.3-5 +- incorporate package review feedback + +* Mon Oct 23 2006 Ivana Varekova - 1.2.3-4 - fix #209424 - fix libz.a permissions -* Wed Jul 19 2006 Ivana Varekova 1.2.3-3 +* Wed Jul 19 2006 Ivana Varekova - 1.2.3-3 - add cflags (#199379) * Wed Jul 12 2006 Jesse Keating - 1.2.3-2 @@ -180,22 +173,22 @@ rm -rf ${RPM_BUILD_ROOT} as it should) - run tests and only build the package if they succeed -* Thu Apr 25 2002 Trond Eivind Glomsr�d 1.1.4-1 +* Thu Apr 25 2002 Trond Eivind Glomsrød 1.1.4-1 - 1.1.4 -* Wed Jan 30 2002 Trond Eivind Glomsr�d 1.1.3-25.7 +* Wed Jan 30 2002 Trond Eivind Glomsrød 1.1.3-25.7 - Fix double free -* Sun Aug 26 2001 Trond Eivind Glomsr�d 1.1.3-24 +* Sun Aug 26 2001 Trond Eivind Glomsrød 1.1.3-24 - Add example.c and minigzip.c to the doc files, as they are listed as examples in the README (#52574) -* Mon Jun 18 2001 Trond Eivind Glomsr�d +* Mon Jun 18 2001 Trond Eivind Glomsrød - Updated URL - Add version dependency for zlib-devel - s/Copyright/License/ -* Wed Feb 14 2001 Trond Eivind Glomsr�d +* Wed Feb 14 2001 Trond Eivind Glomsrød - bumped version number - this is the old version without the performance enhancements * Fri Sep 15 2000 Florian La Roche @@ -210,16 +203,16 @@ rm -rf ${RPM_BUILD_ROOT} * Thu Jul 13 2000 Prospector - automatic rebuild -* Sun Jul 02 2000 Trond Eivind Glomsr�d +* Sun Jul 02 2000 Trond Eivind Glomsrød - rebuild * Tue Jun 13 2000 Jeff Johnson - FHS packaging to build on solaris2.5.1. -* Wed Jun 07 2000 Trond Eivind Glomsr�d +* Wed Jun 07 2000 Trond Eivind Glomsrød - use %%{_mandir} and %%{_tmppath} -* Fri May 12 2000 Trond Eivind Glomsr�d +* Fri May 12 2000 Trond Eivind Glomsrød - updated URL and source location - moved README to main package