From cd1bb350b4463b9a7e7c1f6a33f8427eea25383f Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Apr 11 2005 14:38:23 +0000
Subject: - fix bug 122408 - zlib build process runs configure twice


---

diff --git a/zlib.spec b/zlib.spec
index 89bfb22..c52aafd 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,7 +1,7 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
 Version: 1.2.2.2
-Release: 2
+Release: 3
 Group: System Environment/Libraries
 Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
 Patch0: zlib-1.1.4-make-test.patch
@@ -29,22 +29,22 @@ library.
 %patch0 -p1 -b .make-test
 
 %build
-
 CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
+mv Makefile Makefile.shared
+make -f Makefile.shared
 
 # now build the static lib
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
+mv Makefile Makefile.static
+make -f Makefile.static
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
 
-CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
-make install prefix=${RPM_BUILD_ROOT}%{_prefix}
-
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
-make install prefix=${RPM_BUILD_ROOT}%{_prefix}
+make -f Makefile.shared install prefix=${RPM_BUILD_ROOT}%{_prefix}
+make -f Makefile.static install prefix=${RPM_BUILD_ROOT}%{_prefix}
 
 install -m644 zutil.h ${RPM_BUILD_ROOT}%{_includedir}/zutil.h
 
@@ -55,7 +55,8 @@ if [ "%{_prefix}/lib" != "%{_libdir}" ]; then
 fi
 
 %check
-make %{?_smp_mflags} test
+make -f Makefile.shared %{?_smp_mflags} test
+make -f Makefile.static %{?_smp_mflags} test
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -78,6 +79,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Wed Mar 30 2005 Ivana Varekova <varekova@redhat.com> 1.2.2.2-3
+- fix bug 122408 - zlib build process runs configure twice
+
 * Fri Mar  4 2005 Jeff Johnson <jbj@redhat.com> 1.2.2.2-2
 - rebuild with gcc4.