rpms/yajl/devel lloyd-yajl-cflags.patch,NONE,1.1 yajl.spec,1.1,1.2

[Daniel P. Berrange]

Author: berrange

Update of /cvs/pkgs/rpms/yajl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27264

Modified Files:
	yajl.spec 
Added Files:
	lloyd-yajl-cflags.patch 
Log Message:
Fix ignoring of cflags (rhbz #547500)

lloyd-yajl-cflags.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lloyd-yajl-cflags.patch ---
diff -rup lloyd-yajl-45a1bdb.orig/CMakeLists.txt lloyd-yajl-45a1bdb.new/CMakeLists.txt
--- lloyd-yajl-45a1bdb.orig/CMakeLists.txt	2009-10-29 23:35:39.000000000 +0000
+++ lloyd-yajl-45a1bdb.new/CMakeLists.txt	2010-01-11 17:14:01.000000000 +0000
@@ -42,7 +42,7 @@ IF (NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE "Release")
 ENDIF (NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_C_FLAGS "-Wall")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 IF (WIN32) 
   ADD_DEFINITIONS(-DWIN32)
   SET(linkFlags "/PDB:NONE /INCREMENTAL:NO /OPT:NOREF /OPT:NOICF")


Index: yajl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yajl/devel/yajl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- yajl.spec	9 Dec 2009 23:05:44 -0000	1.1
+++ yajl.spec	11 Jan 2010 17:27:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name: yajl
 Version: 1.0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Yet Another JSON Library (YAJL)
 
 Group: Development/Libraries
@@ -29,6 +29,7 @@ URL: http://lloyd.github.com/yajl/
 %global githash 45a1bdb
 Source0: lloyd-%{name}-%{githash}.tar.gz
 Patch1: lloyd-%{name}-lib64.patch
+Patch2: lloyd-%{name}-cflags.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake
@@ -54,6 +55,8 @@ necessary for developing against the YAJ
 %setup -q -n lloyd-%{name}-%{githash}
 # Fix lib vs lib64 problems
 %patch1 -p1
+# Fix ignoring of CFLAGS
+%patch2 -p1
 
 %build
 # NB, we are not using upstream's 'configure'/'make'
@@ -104,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 11 2010 Daniel P. Berrange <berrange at redhat.com> - 1.0.7-3
+- Fix ignoring of cflags (rhbz #547500)
+
 * Tue Dec  8 2009 Daniel P. Berrange <berrange at redhat.com> - 1.0.7-2
 - Change use of 'define' to 'global'