[zlib] - moved /lib* to /usr/lib*
pschiffe
pschiffe at fedoraproject.org
Mon Jun 11 17:44:39 UTC 2012
commit 3912c2cbce7786139de79263015b09dfec8297fa
Author: Peter Schiffer <pschiffe at redhat.com>
Date: Mon Jun 11 19:44:17 2012 +0200
- moved /lib* to /usr/lib*
zlib.spec | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/zlib.spec b/zlib.spec
index d0e97da..7d9e44d 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,14 +1,13 @@
Summary: The zlib compression and decompression library
Name: zlib
Version: 1.2.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Libraries
Source: http://www.zlib.net/zlib-%{version}.tar.bz2
Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
URL: http://www.zlib.net/
# /contrib/dotzlib/ have Boost license
License: zlib and Boost
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake, autoconf, libtool
%description
@@ -75,24 +74,13 @@ make %{?_smp_mflags}
make test
%install
-rm -rf ${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
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -104,7 +92,7 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
%doc README ChangeLog FAQ
-/%{_lib}/libz.so.*
+%{_libdir}/libz.so.*
%files devel
%defattr(-,root,root,-)
@@ -133,6 +121,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/pkgconfig/minizip.pc
%changelog
+* Mon Jun 11 2012 Peter Schiffer <pschiffe at redhat.com> - 1.2.7-3
+- moved /lib* to /usr/lib*
+
* Mon Jun 11 2012 Peter Schiffer <pschiffe at redhat.com> - 1.2.7-2
- recompiled with -Wl,-z,relro flags
More information about the scm-commits
mailing list