Author: qboosh Date: Wed Sep 9 15:39:14 2009 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.2.3.3 (almost whole world has LFS-capable zlib, why not PLD?) - asmopt patch replaced by make argument - spec cleaned up and simplified
---- Files affected: packages/zlib: zlib.spec (1.108 -> 1.109) ---- Diffs: ================================================================ Index: packages/zlib/zlib.spec diff -u packages/zlib/zlib.spec:1.108 packages/zlib/zlib.spec:1.109 --- packages/zlib/zlib.spec:1.108 Fri Feb 27 12:25:14 2009 +++ packages/zlib/zlib.spec Wed Sep 9 17:39:08 2009 @@ -2,7 +2,7 @@ # # Conditional build: %bcond_without asmopt # without assembler optimization for i586+ -%bcond_with pax +%bcond_with pax # synonym for the above (asm doesn't have non-exec stack attributes) # %ifnarch i586 i686 pentium3 pentium4 athlon %undefine with_asmopt @@ -31,13 +31,12 @@ Summary(tr.UTF-8): Sıkıştırma işlemleri için kitaplık Summary(uk.UTF-8): Бібліотека для компресії та декомпресії Name: zlib -Version: 1.2.3 -Release: 8 +Version: 1.2.3.3 +Release: 1 License: BSD Group: Libraries -Source0: http://www.zlib.net/%{name}-%{version}.tar.gz -# Source0-md5: debc62758716a169df9f62e6ab2bc634 -Patch0: %{name}-asmopt.patch +Source0: http://www.zlib.net/current/beta/%{name}-%{version}.tar.gz +# Source0-md5: 0635a2bb04535914cd523c72181574ad URL: http://www.zlib.net/ BuildRequires: rpm >= 4.4.9-56 Obsoletes: zlib1 @@ -261,8 +260,6 @@ %setup -q %if %{with asmopt} -%patch0 -p1 - %ifarch i686 pentium3 pentium4 athlon cp contrib/asm686/match.S . %endif @@ -272,31 +269,26 @@ %endif %build -CFLAGS="-D_REENTRANT -fPIC %{rpmcflags} %{?with_asmopt:-DASMV}" \ -LDSHARED="%{__cc} $CFLAGS -shared -Wl,-soname,libz.so.1" \ CC="%{__cc}" \ +CFLAGS="-D_REENTRANT %{rpmcflags} %{?with_asmopt:-DASMV}" \ ./configure \ --prefix=%{_prefix} \ - --shared + --libdir=%{_libdir} -%{__make} -%{__make} libz.a +%{__make} \ + %{?with_asmopt:OBJA=match.o} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/%{_lib},%{_includedir},%{_libdir},%{_mandir}/man3} +install -d $RPM_BUILD_ROOT/%{_lib} %{__make} install \ - prefix=$RPM_BUILD_ROOT%{_prefix} - -%if "%{_libdir}" != "%{_prefix}/lib" -mv $RPM_BUILD_ROOT{%{_prefix}/lib/*,%{_libdir}} -%endif + DESTDIR=$RPM_BUILD_ROOT \ + libdir=%{_libdir} -install libz.a $RPM_BUILD_ROOT%{_libdir} install zutil.h $RPM_BUILD_ROOT%{_includedir} -mv -f $RPM_BUILD_ROOT%{_libdir}/libz.so.*.* $RPM_BUILD_ROOT/%{_lib} +mv -f $RPM_BUILD_ROOT%{_libdir}/libz.so.* $RPM_BUILD_ROOT/%{_lib} ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} && echo libz.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libz.so %clean @@ -307,18 +299,23 @@ %files %defattr(644,root,root,755) -%doc ChangeLog FAQ README algorithm.txt +%doc ChangeLog FAQ README doc/algorithm.txt doc/txtvsbin.txt %attr(755,root,root) /%{_lib}/libz.so.*.*.* +%attr(755,root,root) %ghost /%{_lib}/libz.so.1 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libz.so -%{_includedir}/* -%{_mandir}/man3/* +%{_includedir}/zconf.h +%{_includedir}/zlib.h +%{_includedir}/zlibdefs.h +%{_includedir}/zutil.h +%{_pkgconfigdir}/zlib.pc +%{_mandir}/man3/zlib.3* %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libz.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -326,6 +323,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.109 2009/09/09 15:39:08 qboosh +- updated to 1.2.3.3 (almost whole world has LFS-capable zlib, why not PLD?) +- asmopt patch replaced by make argument +- spec cleaned up and simplified + Revision 1.108 2009/02/27 11:25:14 glen - release 8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zlib/zlib.spec?r1=1.108&r2=1.109&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
