SPECS (RA-branch): zlib.spec - security update to 1.2.3 - release ...

hawk hawk at pld-linux.org
Sun Jul 31 19:57:53 CEST 2005


Author: hawk                         Date: Sun Jul 31 17:57:53 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- security update to 1.2.3
- release 2 for Ra

---- Files affected:
SPECS:
   zlib.spec (1.66.2.2 -> 1.66.2.3) 

---- Diffs:

================================================================
Index: SPECS/zlib.spec
diff -u SPECS/zlib.spec:1.66.2.2 SPECS/zlib.spec:1.66.2.3
--- SPECS/zlib.spec:1.66.2.2	Tue Jan  6 02:53:29 2004
+++ SPECS/zlib.spec	Sun Jul 31 19:57:48 2005
@@ -1,37 +1,36 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _without_asmopt		- without assmbler optimization for i[56]86
-
-%ifnarch i586 i686 athlon
-%define				_asmopt		0
-%else
-%{?_without_asmopt:%define	_asmopt		0}
-%{!?_without_asmopt:%define	_asmopt		1}
+%bcond_without	asmopt	# without assembler optimization for i586+
+%bcond_with	pax
+#
+%ifnarch i586 i686 pentium3 pentium4 athlon
+%undefine	with_asmopt
+%endif
+%if %{with pax} && %{with asmopt}
+%undefine	with_asmopt
 %endif
-
 Summary:	Library for compression and decompression
 Summary(de):	Library für die Komprimierung und Dekomprimierung
 Summary(es):	Biblioteca para compresión y descompresión
-Summary(fr):	bibliothčque de compression et décompression
+Summary(fr):	Bibliothčque de compression et décompression
 Summary(pl):	Biblioteka z podprogramami do kompresji i dekompresji
 Summary(pt_BR):	Biblioteca para compressăo e descompressăo
 Summary(ru):	âÉÂĚÉĎÔĹËÁ ÄĚŃ ËĎÍĐŇĹÓÓÉÉ É ÄĹËĎÍĐŇĹÓÓÉÉ
 Summary(tr):	Sýkýţtýrma iţlemleri için kitaplýk
 Summary(uk):	âŚÂĚŚĎÔĹËÁ ÄĚŃ ËĎÍĐŇĹÓŚ§ ÔÁ ÄĹËĎÍĐŇĹÓŚ§
 Name:		zlib
-Version:	1.1.4
-Release:	6
+Version:	1.2.3
+Release:	2
+Epoch:		0
 License:	BSD
 Group:		Libraries
-Source0:	http://www.gzip.org/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5:	abc405d0bdd3ee22782d7aa20e440f08
-Patch0:		%{name}-sharedlib.patch
-Patch1:		%{name}-asmopt.patch
-Patch2:		%{name}-gzprintf_sec.patch
-URL:		http://www.zlib.org/
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Source0:	http://www.zlib.net/%{name}-%{version}.tar.gz
+# Source0-md5:	debc62758716a169df9f62e6ab2bc634
+Patch0:		%{name}-asmopt.patch
+URL:		http://www.zlib.net/
 Obsoletes:	zlib1
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The 'zlib' compression library provides in-memory compression and
@@ -102,7 +101,7 @@
 ÔĎĘ ÖĹ ÓÁÍÉĘ ĐĎÔĎËĎ×ÉĘ ŚÎÔĹŇĆĹĘÓ.
 
 %package devel
-Summary:	header files and libraries for zlib development
+Summary:	Header files and libraries for zlib development
 Summary(de):	Headerdateien und Libraries für zlib-Entwicklung
 Summary(es):	Bibliotecas y archivos de inclusión para desarrollo zlib
 Summary(pl):	Pliki nagłówkowe i dokumentacja do zlib
@@ -110,7 +109,7 @@
 Summary(ru):	čĹÄĹŇŮ É ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍÍÉŇĎ×ÁÎÉŃ Ó zlib
 Summary(uk):	čĹÄĹŇÉ ÔÁ ÂŚÂĚŚĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍŐ×ÁÎÎŃ Ú zlib
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	zlib1-devel
 
 %description devel
@@ -210,7 +209,7 @@
 Summary(ru):	óÔÁÔÉŢĹÓËÁŃ ÂÉÂĚÉĎÔĹËÁ ÄĚŃ ĐŇĎÇŇÁÍÍÉŇĎ×ÁÎÉŃ Ó zlib
 Summary(uk):	óÔÁÔÉŢÎÁ ÂŚÂĚŚĎÔĹËÁ ÄĚŃ ĐŇĎÇŇÁÍŐ×ÁÎÎŃ Ú zlib
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 The 'zlib' compression library provides in-memory compression and
@@ -231,7 +230,7 @@
 strumieniu danych.
 
 Pakiet ten zawiera bibliotekę statyczną potrzebną przy tworzeniu
-wałasnych programów wykorzystujących zlib.
+własnych programów wykorzystujących zlib.
 
 %description static -l es
 Static libraries for zlib development.
@@ -249,65 +248,59 @@
 
 %prep
 %setup -q
+
+%if %{with asmopt}
 %patch0 -p1
-%{?_with_asmopt:%patch1 -p1}
 
-%if %{_asmopt}
-%patch1 -p1
-%ifarch i686 athlon
+%ifarch i686 pentium3 pentium4 athlon
 cp contrib/asm686/match.S .
 %endif
 %ifarch i586
 cp contrib/asm586/match.S .
 %endif
 %endif
-%patch2 -p1
 
 %build
-
-CFLAGS="-D_REENTRANT -fPIC %{rpmcflags}"
-%if %{_asmopt}
-CFLAGS="$CFLAGS -O3 -DASMV"
-%endif
-export CFLAGS
-CC=%{__cc}; export CC
+CFLAGS="-D_REENTRANT -fPIC %{rpmcflags} %{?with_asmopt:-DASMV}" \
+CC="%{__cc}" \
 ./configure \
 	--prefix=%{_prefix} \
 	--shared
 
 %{__make}
-
 %{__make} libz.a
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/lib,%{_includedir},%{_libdir},%{_mandir}/man3}
+install -d $RPM_BUILD_ROOT{/%{_lib},%{_includedir},%{_libdir},%{_mandir}/man3}
+
+%{__make} install \
+	prefix=$RPM_BUILD_ROOT%{_prefix}
+
+%if "%{_libdir}" != "%{_prefix}/lib"
+mv $RPM_BUILD_ROOT{%{_prefix}/lib/*,%{_libdir}}
+%endif
 
 install libz.a $RPM_BUILD_ROOT%{_libdir}
 install zutil.h $RPM_BUILD_ROOT%{_includedir}
-install zlib.3 $RPM_BUILD_ROOT%{_mandir}/man3
 
-%{__make} prefix=$RPM_BUILD_ROOT%{_prefix} install
-
-mv $RPM_BUILD_ROOT%{_libdir}/libz.so.*.* $RPM_BUILD_ROOT/lib
-cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf /lib/$(cd ../../lib && ls libz.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libz.so
+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
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/lib*.so.*.*
+%doc ChangeLog FAQ README algorithm.txt
+%attr(755,root,root) /%{_lib}/libz.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc README ChangeLog algorithm.txt FAQ
-%attr(755,root,root) %{_libdir}/lib*.so
-
+%attr(755,root,root) %{_libdir}/libz.so
 %{_includedir}/*
 %{_mandir}/man3/*
 
@@ -321,6 +314,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66.2.3  2005/07/31 17:57:48  hawk
+- security update to 1.2.3
+- release 2 for Ra
+
 Revision 1.66.2.2  2004/01/06 01:53:29  twittner
 - added md5.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zlib.spec?r1=1.66.2.2&r2=1.66.2.3&f=u




More information about the pld-cvs-commit mailing list