packages: zlib/zlib.spec - add minizip from contrib; rel 2

[glen]

Author: glen                         Date: Sun Sep 20 10:58:33 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add minizip from contrib; rel 2

---- Files affected:
packages/zlib:
   zlib.spec (1.109 -> 1.110) 

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.109 packages/zlib/zlib.spec:1.110
--- packages/zlib/zlib.spec:1.109	Wed Sep  9 17:39:08 2009
+++ packages/zlib/zlib.spec	Sun Sep 20 12:58:28 2009
@@ -32,7 +32,8 @@
 Summary(uk.UTF-8):	Бібліотека для компресії та декомпресії
 Name:		zlib
 Version:	1.2.3.3
-Release:	1
+Patch0:		minizip-autotools.patch
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	http://www.zlib.net/current/beta/%{name}-%{version}.tar.gz
@@ -256,8 +257,26 @@
 Цей пакет містить статичну бібліотеку, необхідну для написання
 програм, що використовують zlib.
 
+%package -n minizip
+Summary:	Minizip manipulates files from a .zip archive
+Group:		Libraries
+URL:		http://www.winimage.com/zLibDll/minizip.html
+
+%description  -n minizip
+Minizip manipulates files from a .zip archive
+
+%package -n minizip-devel
+Summary:	Development files for the minizip library
+Group:		Development/Libraries
+Requires:	minizip = %{version}-%{release}
+
+%description -n minizip-devel
+This package contains the libraries and header files needed for
+developing applications which use minizip.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %if %{with asmopt}
 %ifarch i686 pentium3 pentium4 athlon
@@ -278,6 +297,18 @@
 %{__make} \
 	%{?with_asmopt:OBJA=match.o}
 
+cd contrib/minizip
+%{__aclocal}
+%{__libtoolize}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+%configure \
+	--enable-static=no
+# SMP flags are explicitly omitted due to a libtool/autoconf
+# dependency race condition
+%{__make} -j1
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/%{_lib}
@@ -288,6 +319,9 @@
 
 install zutil.h $RPM_BUILD_ROOT%{_includedir}
 
+%{__make} -C contrib/minizip install \
+	DESTDIR=$RPM_BUILD_ROOT \
+
 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
 
@@ -297,6 +331,9 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	-n minizip -p /sbin/ldconfig
+%postun	-n minizip -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog FAQ README doc/algorithm.txt doc/txtvsbin.txt
@@ -317,12 +354,30 @@
 %defattr(644,root,root,755)
 %{_libdir}/libz.a
 
+%files -n minizip
+%defattr(644,root,root,755)
+%doc contrib/minizip/ChangeLogUnzip
+%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
+
+%files -n minizip-devel
+%defattr(644,root,root,755)
+%{_libdir}/libminizip.la
+%{_libdir}/libminizip.so
+%{_pkgconfigdir}/minizip.pc
+%{_includedir}/minizip
+
 %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.110  2009/09/20 10:58:28  glen
+- add minizip from contrib; rel 2
+
 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
================================================================

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