diff --git a/libz.spec b/libz.spec index 394db92..b538602 100644 --- a/libz.spec +++ b/libz.spec @@ -1,6 +1,6 @@ Name: libz Version: 1.2.11 -Release: 3mamba +Release: 4mamba Summary: The zlib compression and decompression library Group: System/Libraries Vendor: openmamba @@ -41,50 +41,28 @@ The zlib library is used by many different system programs. This package contains static libraries and header files needed for development. -%package -n libminizip +%package -n libminizip1 Summary: Minizip manipulates files from a .zip archive Group: System/Libraries Provides: minizip Obsoletes: minizip -%description -n libminizip +%description -n libminizip1 Minizip manipulates files from a .zip archive. -%package -n libminizip-devel +%package -n libminizip1-devel Summary: Static libraries and headers for libminizip Group: Development/Libraries -Requires: libminizip = %{?epoch:%epoch:}%{version}-%{release} +Requires: libminizip1 = %{?epoch:%epoch:}%{version}-%{release} Provides: minizip-devel Obsoletes: minizip-devel -%description -n libminizip-devel +%description -n libminizip1-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) -Group: System/Libraries - -%description -n lib32-libz -The zlib compression library provides in-memory compression and decompression functions, including integrity checks of the uncompressed data. -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. - -%package -n lib32-libz-devel -Summary: 32bit static libraries and headers for %{name} -Group: Development/Libraries -Requires: lib32-%{name} = %{?epoch:%epoch:}%{version}-%{release} -Requires: %{name}-devel = %{?epoch:%epoch:}%{version}-%{release} - -%description -n lib32-libz-devel -The zlib compression library provides in-memory compression and decompression functions, including integrity checks of the uncompressed data. -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. -%endif +%debug_package %prep %setup -q -n zlib-%{version} @@ -92,11 +70,6 @@ This package contains static libraries and header files need for development. #%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 - %build CC=%{_target_platform}-gcc \ CFLAGS="%{optflags}" \ @@ -127,32 +100,17 @@ cd ../.. cd contrib/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 -#make clean -#CC=%{_target_platform}-gcc \ -#CFLAGS="%{optflags} -m32" \ -#CXXLAGS="%{optflags} -m32" \ -#./configure --prefix=%{_prefix} --libdir=%{_prefix}/lib -#%make -#make install-libs DESTDIR=%{buildroot} -# -#install -d %{buildroot}/lib -#mv %{buildroot}%{_prefix}/lib/libz.so.* %{buildroot}/lib -#ln -sf ../../lib/libz.so.%{version} %{buildroot}%{_prefix}/lib/libz.so -#%endif - %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post -n libminizip1 -p /sbin/ldconfig +%postun -n libminizip1 -p /sbin/ldconfig + %files %defattr(-,root,root) %{_libdir}/libz.so.* @@ -166,14 +124,11 @@ cd ../.. %{_mandir}/man3/zlib.* %doc ChangeLog FAQ README -%files -n libminizip +%files -n libminizip1 %defattr(-,root,root) %{_libdir}/libminizip.so.* -#%{_bindir}/minizip -#%{_bindir}/miniunz - -%files -n libminizip-devel +%files -n libminizip1-devel %defattr(-,root,root) %dir %{_includedir}/minizip %{_includedir}/minizip/*.h @@ -182,19 +137,10 @@ cd ../.. %{_libdir}/pkgconfig/minizip.pc %doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt -#%ifarch x86_64_disabled -#%files -n lib32-libz -#%defattr(-,root,root) -#/lib/libz.so.* -# -#%files -n lib32-libz-devel -#%defattr(-,root,root) -#%{_prefix}/lib/libz.a -#%{_prefix}/lib/libz.so -#%{_prefix}/lib/pkgconfig/zlib.pc -#%endif - %changelog +* Tue Sep 29 2020 Silvan Calarco 1.2.11-4mamba +- rebuilt with libminizip as libminizip1 legacy package; added debug package + * Thu Jan 16 2020 Silvan Calarco 1.2.11-3mamba - x86_64: obsolete lib32-libz