- Resolves #240277 Move libz to /lib(64)

This commit is contained in:
Ivana Varekova 2007-05-21 08:57:37 +00:00
parent 777cf2b2a7
commit 6f0296f6b9

View File

@ -1,7 +1,7 @@
Summary: The zlib compression and decompression library Summary: The zlib compression and decompression library
Name: zlib Name: zlib
Version: 1.2.3 Version: 1.2.3
Release: 11%{?dist} Release: 12%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://www.zlib.net/zlib-%{version}.tar.gz Source: http://www.zlib.net/zlib-%{version}.tar.gz
#Patch0: zlib-1.1.4-make-test.patch #Patch0: zlib-1.1.4-make-test.patch
@ -43,13 +43,9 @@ make %{?_smp_mflags}
%install %install
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT libdir=/%{_lib}
mkdir $RPM_BUILD_ROOT/%{_lib}/ ln -sf ../%{_lib}/libz.so.%{version} $RPM_BUILD_ROOT/%{_lib}/libz.so
mv $RPM_BUILD_ROOT/%{_libdir}/libz.so.%{version} $RPM_BUILD_ROOT/%{_lib}/
mv $RPM_BUILD_ROOT/%{_libdir}/libz.so.* $RPM_BUILD_ROOT/%{_lib}/
ln -sf ../../%{_lib}/libz.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libz.so
mkdir -p ${RPM_BUILD_ROOT}%{_includedir} mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
cp -p zconf.h ${RPM_BUILD_ROOT}%{_includedir} cp -p zconf.h ${RPM_BUILD_ROOT}%{_includedir}
@ -59,7 +55,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
cp -p zlib.3 ${RPM_BUILD_ROOT}%{_mandir}/man3 cp -p zlib.3 ${RPM_BUILD_ROOT}%{_mandir}/man3
# Remove unuseful files created by libtool # Remove unuseful files created by libtool
rm -f $RPM_BUILD_ROOT%{_libdir}/libz.la rm -f $RPM_BUILD_ROOT/%{_lib}/libz.la
%clean %clean
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
@ -76,12 +72,16 @@ rm -rf ${RPM_BUILD_ROOT}
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc algorithm.txt minigzip.c example.c %doc algorithm.txt minigzip.c example.c
%{_libdir}/*.a /%{_lib}/*.a
%{_libdir}/*.so /%{_lib}/*.so
%{_includedir}/* %{_includedir}/*
%{_mandir}/man3/zlib.3* %{_mandir}/man3/zlib.3*
%changelog %changelog
* Mon May 21 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-12
- Resolves #240277
Move libz to /lib(64)
* Mon Apr 23 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-11 * Mon Apr 23 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-11
- Resolves: 237295 - Resolves: 237295
fix Summary tag fix Summary tag