diff --git a/libz.spec b/libz.spec index 61a2bf0..db9137a 100644 --- a/libz.spec +++ b/libz.spec @@ -1,6 +1,6 @@ Name: libz Version: 1.2.8 -Release: 1mamba +Release: 2mamba Summary: The zlib compression and decompression library Group: System/Libraries Vendor: openmamba @@ -114,21 +114,23 @@ 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/ 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 +#%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} @@ -139,16 +141,16 @@ ln -sf ../../lib/libz.so.%{version} %{buildroot}%{_prefix}/lib/libz.so %files %defattr(-,root,root) /%{_lib}/libz.so.* -%{_mandir}/man3/zlib.* %files devel %defattr(-,root,root) +%{_includedir}/*.h +%dir %{_includedir}/minizip +%{_includedir}/minizip/*.h %{_libdir}/libz.a %{_libdir}/libz.so %{_libdir}/pkgconfig/zlib.pc -%{_includedir}/zconf.h -%{_includedir}/zlib.h -%{_includedir}/zutil.h +%{_mandir}/man3/zlib.* %doc ChangeLog FAQ README %files -n minizip @@ -157,19 +159,22 @@ ln -sf ../../lib/libz.so.%{version} %{buildroot}%{_prefix}/lib/libz.so %{_bindir}/miniunz %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 +#%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 +* Sun Dec 11 2016 Silvan Calarco 1.2.8-2mamba +- install minizip headers for chromium + * Tue Apr 30 2013 Automatic Build System 1.2.8-1mamba - automatic version update by autodist