rpms/zlib
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- moved /lib* to /usr/lib*

Browse Source
This commit is contained in:
Peter Schiffer 2012-06-11 19:44:17 +02:00
parent b718fe7fd1
commit 3912c2cbce
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zlib.spec
View File

@ -1,14 +1,13 @@
Summary: The zlib compression and decompression library Summary: The zlib compression and decompression library
Name: zlib Name: zlib
Version: 1.2.7 Version: 1.2.7
Release: 2%{?dist} Release: 3%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://www.zlib.net/zlib-%{version}.tar.bz2 Source: http://www.zlib.net/zlib-%{version}.tar.bz2
Patch0: zlib-1.2.5-minizip-fixuncrypt.patch Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
URL: http://www.zlib.net/ URL: http://www.zlib.net/
# /contrib/dotzlib/ have Boost license # /contrib/dotzlib/ have Boost license
License: zlib and Boost License: zlib and Boost
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake, autoconf, libtool BuildRequires: automake, autoconf, libtool
%description %description
@ -75,24 +74,13 @@ make %{?_smp_mflags}
make test make test
%install %install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT/%{_lib}
mv $RPM_BUILD_ROOT%{_libdir}/libz.so.* $RPM_BUILD_ROOT/%{_lib}/
reldir=$(echo %{_libdir} | sed 's,/$,,;s,/[^/]\+,../,g')%{_lib}
oldlink=$(readlink $RPM_BUILD_ROOT%{_libdir}/libz.so)
ln -sf $reldir/$(basename $oldlink) $RPM_BUILD_ROOT%{_libdir}/libz.so
cd contrib/minizip cd contrib/minizip
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -rf ${RPM_BUILD_ROOT}
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -104,7 +92,7 @@ rm -rf ${RPM_BUILD_ROOT}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README ChangeLog FAQ %doc README ChangeLog FAQ
/%{_lib}/libz.so.* %{_libdir}/libz.so.*
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -133,6 +121,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/pkgconfig/minizip.pc %{_libdir}/pkgconfig/minizip.pc
%changelog %changelog
* Mon Jun 11 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-3
- moved /lib* to /usr/lib*
* Mon Jun 11 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-2 * Mon Jun 11 2012 Peter Schiffer <pschiffe@redhat.com> - 1.2.7-2
- recompiled with -Wl,-z,relro flags - recompiled with -Wl,-z,relro flags