From 6f0296f6b9f28d8adf8f5abe8d1c5cf8d77c94c6 Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: May 21 2007 08:57:37 +0000
Subject: - Resolves #240277 Move libz to /lib(64)


---

diff --git a/zlib.spec b/zlib.spec
index d0834a5..02d56d1 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,7 +1,7 @@
 Summary: The zlib compression and decompression library
 Name: zlib
 Version: 1.2.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.gz
 #Patch0: zlib-1.1.4-make-test.patch
@@ -43,13 +43,9 @@ make %{?_smp_mflags}
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT libdir=/%{_lib}
 
-mkdir $RPM_BUILD_ROOT/%{_lib}/
-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
+ln -sf ../%{_lib}/libz.so.%{version} $RPM_BUILD_ROOT/%{_lib}/libz.so
 
 mkdir -p ${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
 
 # Remove unuseful files created by libtool
-rm -f $RPM_BUILD_ROOT%{_libdir}/libz.la
+rm -f $RPM_BUILD_ROOT/%{_lib}/libz.la
     
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -76,12 +72,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %files devel
 %defattr(-,root,root,-)
 %doc algorithm.txt minigzip.c example.c
-%{_libdir}/*.a
-%{_libdir}/*.so
+/%{_lib}/*.a
+/%{_lib}/*.so
 %{_includedir}/*
 %{_mandir}/man3/zlib.3*
 
 %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
 - Resolves: 237295
   fix Summary tag