rpms/zlib/devel zlib-1.2.3-cflags.patch, NONE, 1.1 zlib.spec, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: varekova

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

Modified Files:
	zlib.spec 
Added Files:
	zlib-1.2.3-cflags.patch 
Log Message:
- add cflags (#199379)


zlib-1.2.3-cflags.patch:
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zlib-1.2.3-cflags.patch ---
--- zlib-1.2.3/configure.cflags	2005-07-11 22:11:57.000000000 +0200
+++ zlib-1.2.3/configure	2006-07-19 09:47:58.000000000 +0200
@@ -76,7 +76,7 @@
   SFLAGS=${CFLAGS-"-fPIC -O3"}
   CFLAGS="$cflags"
   case `(uname -s || echo unknown) 2>/dev/null` in
-  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
+  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc $CFLAGS -shared -Wl,-soname,libz.so.1"};;
   CYGWIN* | Cygwin* | cygwin* | OS/2* )
              EXE='.exe';;
   QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
@@ -97,7 +97,7 @@
              SHAREDLIBV=libz.$VER$shared_ext
              SHAREDLIBM=libz.$VER1$shared_ext
              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;
-  *)             LDSHARED=${LDSHARED-"$cc -shared"};;
+  *)             LDSHARED=${LDSHARED-"$cc $CFLAGS -shared"};;
   esac
 else
   # find system name and corresponding cc options


Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- zlib.spec	12 Jul 2006 19:22:28 -0000	1.28
+++ zlib.spec	19 Jul 2006 08:34:35 -0000	1.29
@@ -1,10 +1,11 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
 Version: 1.2.3
-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
+Patch1: zlib-1.2.3-cflags.patch
 URL: http://www.gzip.org/zlib/
 License: BSD
 Prefix: %{_prefix}
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .make-test
+%patch1 -p1 -b .cflags
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
@@ -77,6 +79,9 @@
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Wed Jul 19 2006 Ivana Varekova <varekova at redhat.com> 1.2.3-3
+- add cflags (#199379)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-2
 - rebuild