rpms/csmash/devel csmash-0.6.6-configure.patch, NONE, 1.1 csmash.spec, 1.13, 1.14

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/csmash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5158

Modified Files:
	csmash.spec 
Added Files:
	csmash-0.6.6-configure.patch 
Log Message:
Add patch to configure to remove empty '-I' as further include paths seem to be ignored when it's present, this caused SDL.h to not be found.


csmash-0.6.6-configure.patch:

--- NEW FILE csmash-0.6.6-configure.patch ---
diff -Naupr csmash-0.6.6.orig/configure csmash-0.6.6/configure
--- csmash-0.6.6.orig/configure	2003-08-16 07:54:31.000000000 +0200
+++ csmash-0.6.6/configure	2006-08-30 14:04:27.000000000 +0200
@@ -5515,8 +5515,8 @@ echo "${ECHO_T}libraries $x_libraries, h
 fi
 
 
-CFLAGS="-I $x_includes"
-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+CFLAGS="$x_includes"
+LDFLAGS="-L$x_libraries -L$libdir"
 CXXFLAGS="$CFLAGS -Wall"
 
 
diff -Naupr csmash-0.6.6.orig/configure.in csmash-0.6.6/configure.in
--- csmash-0.6.6.orig/configure.in	2003-08-16 07:53:55.000000000 +0200
+++ csmash-0.6.6/configure.in	2006-08-30 14:03:41.000000000 +0200
@@ -19,8 +19,8 @@ AC_PATH_PROG(GZIP, gzip)
 
 AC_PATH_X
 
-CFLAGS="-I $x_includes"
-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+CFLAGS="$x_includes"
+LDFLAGS="-L$x_libraries -L$libdir"
 CXXFLAGS="$CFLAGS -Wall"
 
 dnl Checks for libraries.


Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- csmash.spec	28 Aug 2006 09:21:04 -0000	1.13
+++ csmash.spec	30 Aug 2006 12:29:03 -0000	1.14
@@ -8,6 +8,7 @@
 Source: http://dl.sf.net/cannonsmash/csmash-%{version}.tar.gz
 Patch0: csmash-0.6.6-64bit-gcc4-fixes.patch
 Patch1: csmash-0.6.6-extraqualif.patch
+Patch2: csmash-0.6.6-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, libjpeg-devel, zlib-devel
 BuildRequires: SDL-devel >= 1.2.0, SDL_mixer-devel, SDL_image-devel
@@ -18,6 +19,8 @@
 %else
 BuildRequires: xorg-x11-devel, Mesa-devel
 %endif
+# Required because we patch configure
+BuildRequires: autoconf, automake17
 
 %description
 CannonSmash is a 3D tabletennis game. The goal of this project is to
@@ -30,6 +33,7 @@
 %setup
 %patch0 -p1 -b .64bit-gcc4
 %patch1 -p1 -b .extraqualif
+%patch2 -p1 -b .configure
 
 
 %build
@@ -78,6 +82,8 @@
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.6.6-13
 - FC6 rebuild.
 - Remove gcc-c++ build requirement, it's a default.
+- Add patch to configure to remove empty '-I' as further include paths seem to
+  be ignored when it's present, this caused SDL.h to not be found.
 
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.6.6-12
 - FC5 rebuild.