packages: zlib/zlib.spec - reverted last commit
emes
emes at pld-linux.org
Fri Oct 9 01:25:24 CEST 2009
Author: emes Date: Thu Oct 8 23:25:24 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- reverted last commit
---- Files affected:
packages/zlib:
zlib.spec (1.111 -> 1.112)
---- Diffs:
================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.111 packages/zlib/zlib.spec:1.112
--- packages/zlib/zlib.spec:1.111 Fri Oct 9 01:19:53 2009
+++ packages/zlib/zlib.spec Fri Oct 9 01:25:18 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,12 +31,13 @@
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
+Patch0: minizip-autotools.patch
+Release: 2
License: BSD
Group: Libraries
-Source0: http://www.zlib.net/%{name}-%{version}.tar.gz
-# Source0-md5: debc62758716a169df9f62e6ab2bc634
+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
@@ -256,42 +257,72 @@
Цей пакет містить статичну бібліотеку, необхідну для написання
програм, що використовують 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
cp contrib/asm686/match.S .
%endif
%ifarch i586
cp contrib/asm586/match.S .
%endif
+%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} \
+ %{?with_asmopt:OBJA=match.o}
-%{__make}
-%{__make} libz.a
+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},%{_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}
+%{__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
%clean
@@ -300,20 +331,43 @@
%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 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
+
+%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
@@ -321,9 +375,20 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.112 2009/10/08 23:25:18 emes
+- reverted last commit
+
Revision 1.111 2009/10/08 23:19:53 emes
- conditional build with zlib
- zlib disabled on x86_64 due to pointer bug
+
+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
+- 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.111&r2=1.112&f=u
More information about the pld-cvs-commit
mailing list