rpms/csmash/devel csmash-0.6.6-configure.patch, 1.1, 1.2 csmash.spec, 1.14, 1.15

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	csmash-0.6.6-configure.patch csmash.spec 
Log Message:
Fix to use CFLAGS and don't re-run autotools (#227379, Ville Skyttä).


csmash-0.6.6-configure.patch:

Index: csmash-0.6.6-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash-0.6.6-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csmash-0.6.6-configure.patch	30 Aug 2006 12:29:03 -0000	1.1
+++ csmash-0.6.6-configure.patch	6 Feb 2007 09:50:15 -0000	1.2
@@ -7,7 +7,7 @@
  
 -CFLAGS="-I $x_includes"
 -LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
-+CFLAGS="$x_includes"
++CFLAGS="$CFLAGS $x_includes"
 +LDFLAGS="-L$x_libraries -L$libdir"
  CXXFLAGS="$CFLAGS -Wall"
  
@@ -21,7 +21,7 @@
  
 -CFLAGS="-I $x_includes"
 -LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
-+CFLAGS="$x_includes"
++CFLAGS="$CFLAGS $x_includes"
 +LDFLAGS="-L$x_libraries -L$libdir"
  CXXFLAGS="$CFLAGS -Wall"
  


Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- csmash.spec	30 Aug 2006 12:29:03 -0000	1.14
+++ csmash.spec	6 Feb 2007 09:50:15 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://cannonsmash.sourceforge.net/
@@ -19,8 +19,6 @@
 %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
@@ -33,11 +31,14 @@
 %setup
 %patch0 -p1 -b .64bit-gcc4
 %patch1 -p1 -b .extraqualif
+# Hack to not have to re-run autotools
+touch -r configure.in configure.in.stamp
 %patch2 -p1 -b .configure
+touch -r configure.in.stamp configure.in
 
 
 %build
-%configure
+%configure --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
@@ -79,6 +80,9 @@
 
 
 %changelog
+* Tue Feb  6 2007 Matthias Saou <http://freshrpms.net/> 0.6.6-14
+- Fix to use CFLAGS and don't re-run autotools (#227379, Ville Skyttä).
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.6.6-13
 - FC6 rebuild.
 - Remove gcc-c++ build requirement, it's a default.