rpms/glest/devel glest-cflags.patch,1.1,1.2 glest.spec,1.37,1.38

[Bruno Wolff III]

Author: bruno

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

Modified Files:
	glest-cflags.patch glest.spec 
Log Message:
Fix patch collision



glest-cflags.patch:
 Jamrules |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: glest-cflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest-cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- glest-cflags.patch	11 Feb 2010 08:29:36 -0000	1.1
+++ glest-cflags.patch	11 Feb 2010 08:48:26 -0000	1.2
@@ -1,8 +1,8 @@
---- Jamrules.orig	2010-02-11 02:06:28.000000000 -0600
-+++ Jamrules	2010-02-11 02:07:39.000000000 -0600
-@@ -19,9 +19,9 @@
-   LIBS += -lstlport_gcc_debug ;
- }
+--- Jamrules.orig	2010-02-11 02:45:34.000000000 -0600
++++ Jamrules	2010-02-11 02:45:58.000000000 -0600
+@@ -21,9 +21,9 @@
+ 
+ LIBS += -lX11 ;
  
 -COMPILER_CFLAGS            += -Wall -W -Wno-unused -Wno-sign-compare ;
 -COMPILER_CFLAGS_optimize   += -O3 -DNDEBUG ;


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- glest.spec	11 Feb 2010 08:30:49 -0000	1.37
+++ glest.spec	11 Feb 2010 08:48:26 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           glest
 Version:        3.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 11 2010 Bruno Wolff III <bruno at wolff.to> -  3.2.2-5
+- Fix patch collision
+
 * Thu Feb 11 2010 Bruno Wolff III <bruno at wolff.to> -  3.2.2-4
 - Replace include patch by one shared with other distros
 - Add patch for xerces change also shared by other distros