diff --git a/libz.spec b/libz.spec index db9137a..34b69ac 100644 --- a/libz.spec +++ b/libz.spec @@ -1,6 +1,6 @@ Name: libz -Version: 1.2.8 -Release: 2mamba +Version: 1.2.11 +Release: 1mamba Summary: The zlib compression and decompression library Group: System/Libraries Vendor: openmamba @@ -36,17 +36,29 @@ The zlib compression library provides in-memory compression and decompression fu This version of the library supports only one compression method (deflation), but other algorithms may be added later, which will have the same stream interface. The zlib library is used by many different system programs. -This package contains static libraries and header files need for development. +This package contains static libraries and header files needed for development. -%package -n minizip +%package -n libminizip Summary: Minizip manipulates files from a .zip archive Group: System/Libraries -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Provides: minizip +Obsoletes: minizip + +%description -n libminizip +Minizip manipulates files from a .zip archive. + +%package -n libminizip-devel +Summary: Static libraries and headers for libminizip +Group: Development/Libraries +Requires: libminizip = %{?epoch:%epoch:}%{version}-%{release} +Provides: minizip-devel Obsoletes: minizip-devel -%description -n minizip +%description -n libminizip-devel Minizip manipulates files from a .zip archive. +This package contains static libraries and header files needed for development. + %ifarch x86_64_disabled %package -n lib32-libz Summary: The zlib compression and decompression library (32 bit) @@ -73,14 +85,14 @@ This package contains static libraries and header files need for development. %prep %setup -q -n zlib-%{version} -%patch0 -p1 -b .missing_zutil_header -%patch1 -p1 -b .atools +#%patch0 -p1 -b .missing_zutil_header +#%patch1 -p1 -b .atools #%patch2 -p1 -b .g -mkdir contrib/minizip/m4 -cp test/minigzip.c contrib/minizip -iconv -f windows-1252 -t utf-8 ChangeLog.tmp -mv ChangeLog.tmp ChangeLog +#mkdir contrib/minizip/m4 +#cp test/minigzip.c contrib/minizip +#iconv -f windows-1252 -t utf-8 ChangeLog.tmp +#mv ChangeLog.tmp ChangeLog %build CC=%{_target_platform}-gcc \ @@ -90,14 +102,13 @@ CXXLAGS="%{optflags}" \ %make -( - cd contrib/minizip -# autoreconf --install -# % configure \ -# CPPFLAGS="-I%{_builddir}/zlib-%{version}" \ -# LDFLAGS="-L%{_builddir}/zlib-%{version}" - %make CC=%{_host}-gcc -) +cd contrib/minizip +cp Makefile Makefile.orig +cp ../README.contrib readme.txt +autoreconf --install +%configure --enable-static=no +%make CC=%{_host}-gcc +cd ../.. %if "%{_target_cpu}" == "%{_build_cpu}" %make test @@ -112,10 +123,11 @@ mv %{buildroot}%{_libdir}/libz.so.* %{buildroot}/%{_lib} ln -sf ../../%{_lib}/libz.so.%{version} %{buildroot}%{_libdir}/libz.so cd contrib/minizip -install -D -m0755 minizip %{buildroot}%{_bindir}/minizip -install -D -m0755 miniunz %{buildroot}%{_bindir}/miniunz -install -d -m0755 %{buildroot}%{_includedir}/minizip -cp *.h %{buildroot}%{_includedir}/minizip/ +%makeinstall +#install -D -m0755 minizip %{buildroot}%{_bindir}/minizip +#install -D -m0755 miniunz %{buildroot}%{_bindir}/miniunz +#install -d -m0755 %{buildroot}%{_includedir}/minizip +#cp *.h %{buildroot}%{_includedir}/minizip/ cd ../.. #%ifarch x86_64_disabled @@ -145,18 +157,26 @@ cd ../.. %files devel %defattr(-,root,root) %{_includedir}/*.h -%dir %{_includedir}/minizip -%{_includedir}/minizip/*.h %{_libdir}/libz.a %{_libdir}/libz.so %{_libdir}/pkgconfig/zlib.pc %{_mandir}/man3/zlib.* %doc ChangeLog FAQ README -%files -n minizip +%files -n libminizip %defattr(-,root,root) -%{_bindir}/minizip -%{_bindir}/miniunz +%{_libdir}/libminizip.so.* + +#%{_bindir}/minizip +#%{_bindir}/miniunz + +%files -n libminizip-devel +%defattr(-,root,root) +%dir %{_includedir}/minizip +%{_includedir}/minizip/*.h +%{_libdir}/libminizip.la +%{_libdir}/libminizip.so +%{_libdir}/pkgconfig/minizip.pc %doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt #%ifarch x86_64_disabled @@ -172,6 +192,10 @@ cd ../.. #%endif %changelog +* Sat Jun 17 2017 Silvan Calarco 1.2.11-1mamba +- update to 1.2.11 +- rebuilt with --enable-static=no for libminizip + * Sun Dec 11 2016 Silvan Calarco 1.2.8-2mamba - install minizip headers for chromium