packages: zlib/zlib.spec, zlib/minizip-autotools.patch (REMOVED), zlib/zlib...

[qboosh]

Author: qboosh                       Date: Tue Jan 31 16:13:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.6 (note: new minizip soname)
- removed obsolete lfs,minizip-autotools patches
- build static libminizip

---- Files affected:
packages/zlib:
   zlib.spec (1.142 -> 1.143) , minizip-autotools.patch (1.2 -> NONE)  (REMOVED), zlib-lfs.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.142 packages/zlib/zlib.spec:1.143
--- packages/zlib/zlib.spec:1.142	Mon Aug 30 19:27:26 2010
+++ packages/zlib/zlib.spec	Tue Jan 31 17:13:05 2012
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_without	asmopt	# without assembler optimization for i686+
-%bcond_without	tests
+%bcond_without	tests	# do not perform "make check"
 #
 %ifnarch i686 pentium3 pentium4 athlon %{x8664}
 %undefine	with_asmopt
@@ -17,19 +17,17 @@
 Summary(tr.UTF-8):	Sıkıştırma işlemleri için kitaplık
 Summary(uk.UTF-8):	Бібліотека для компресії та декомпресії
 Name:		zlib
-Version:	1.2.5
-Release:	5
+Version:	1.2.6
+Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://www.zlib.net/current/%{name}-%{version}.tar.gz
-# Source0-md5:	c735eab2d659a96e5a594c9e8541ad63
-Patch0:		minizip-autotools.patch
-Patch1:		%{name}-asm.patch
-Patch2:		%{name}-lfs.patch
+# Source0-md5:	618e944d7c7cd6521551e30b32322f4a
+Patch0:		%{name}-asm.patch
 URL:		http://www.zlib.net/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	rpm >= 4.4.9-56
 Obsoletes:	zlib1
 Conflicts:	elinks < 1:0.12
@@ -278,11 +276,21 @@
 Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia aplikacji
 wykorzystujących bibliotekę minizip.
 
+%package -n minizip-static
+Summary:	Static minizip library
+Summary(pl.UTF-8):	Statyczna biblioteka minizip
+Group:		Development/Libraries
+Requires:	minizip-devel = %{epoch}:%{version}-%{release}
+
+%description -n minizip-static
+This package contains the static version of minizip library.
+
+%description -n minizip-static -l pl.UTF-8
+Ten pakiet zawiera statyczną wersję biblioteki minizip.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %if %{with asmopt}
 %ifarch i686 pentium3 pentium4 athlon
@@ -305,13 +313,12 @@
 	%{?with_asmopt:OBJA=match.o PIC_OBJA=match.lo}
 
 cd contrib/minizip
-%{__aclocal}
 %{__libtoolize}
-%{__autoheader}
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-static
+	--enable-demos
 # SMP flags are explicitly omitted due to a libtool/autoconf
 # dependency race condition
 %{__make} -j1
@@ -368,7 +375,7 @@
 %attr(755,root,root) %{_bindir}/miniunzip
 %attr(755,root,root) %{_bindir}/minizip
 %attr(755,root,root) %{_libdir}/libminizip.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libminizip.so.0
+%attr(755,root,root) %ghost %{_libdir}/libminizip.so.1
 
 %files -n minizip-devel
 %defattr(644,root,root,755)
@@ -377,12 +384,21 @@
 %{_includedir}/minizip
 %{_pkgconfigdir}/minizip.pc
 
+%files -n minizip-static
+%defattr(644,root,root,755)
+%{_libdir}/libminizip.a
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.143  2012/01/31 16:13:05  qboosh
+- updated to 1.2.6 (note: new minizip soname)
+- removed obsolete lfs,minizip-autotools patches
+- build static libminizip
+
 Revision 1.142  2010/08/30 17:27:26  glen
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zlib/zlib.spec?r1=1.142&r2=1.143&f=u