rpms/zlib/devel zlib.spec,1.31,1.32

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19555

Modified Files:
	zlib.spec 
Log Message:
- remove the compilation part to build section
  some minor changes




Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- zlib.spec	19 Feb 2007 11:33:27 -0000	1.31
+++ zlib.spec	20 Feb 2007 10:32:33 -0000	1.32
@@ -1,7 +1,7 @@
-Summary: The zlib compression and decompression library
+Summary: The zlib compression and deprefix=${RPM_BUILD_ROOT}%{_prefix}compression library
 Name: zlib
 Version: 1.2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.gz
 Patch0: zlib-1.1.4-make-test.patch
@@ -9,7 +9,6 @@
 Patch2: zlib-1.2.3-lib.patch
 URL: http://www.gzip.org/zlib/
 License: BSD
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description
@@ -33,19 +32,25 @@
 %patch2 -p1 -b .lib
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
+rm -rf ${RPM_BUILD_ROOT} 
+# created Makefile for the shared lib
+CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=${RPM_BUILD_ROOT}%{_prefix} \
+    --libdir=${RPM_BUILD_ROOT}%{_libdir}
 mv Makefile Makefile.shared
 
 # created Makefile for the static lib
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=${RPM_BUILD_ROOT}%{_prefix} \
+    --libdir=${RPM_BUILD_ROOT}%{_libdir} 
 mv Makefile Makefile.static
 
-%install
-rm -rf ${RPM_BUILD_ROOT}
-
-make -f Makefile.shared install prefix=${RPM_BUILD_ROOT}%{_prefix} 
-make -f Makefile.static install prefix=${RPM_BUILD_ROOT}%{_prefix} 
+make -f Makefile.shared 
+make -f Makefile.static clean
+make -f Makefile.static  
 
+%install
+make -f Makefile.shared install 
+make -f Makefile.static install 
+    
 %check
 make -f Makefile.shared %{?_smp_mflags} test
 make -f Makefile.static %{?_smp_mflags} test
@@ -71,6 +76,10 @@
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Tue Feb 20 2007 Ivana Varekova <varekova at redhat.com> - 1.2.3-6
+- remove the compilation part to build section
+  some minor changes
+
 * Mon Feb 19 2007 Ivana Varekova <varekova at redhat.com> - 1.2.3-5
 - incorporate package review feedback