rpms/TnL/devel TnL-070909-system-boost.patch, 1.1, 1.2 TnL.spec, 1.8, 1.9

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	TnL-070909-system-boost.patch TnL.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 071111-7
- Fix patch fuzz build failure


TnL-070909-system-boost.patch:

Index: TnL-070909-system-boost.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TnL/devel/TnL-070909-system-boost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TnL-070909-system-boost.patch	4 Oct 2007 10:07:47 -0000	1.1
+++ TnL-070909-system-boost.patch	7 Sep 2008 13:10:38 -0000	1.2
@@ -1,18 +1,7 @@
-diff -up TnL-source-070909/configure.in~ TnL-source-070909/configure.in
---- TnL-source-070909/configure.in~	2007-09-13 21:45:55.000000000 +0200
-+++ TnL-source-070909/configure.in	2007-09-13 21:45:55.000000000 +0200
-@@ -157,7 +157,6 @@ AC_CONFIG_FILES([
- Makefile
- scripts/Makefile
- src/Makefile
--src/boost/Makefile
- src/interfaces/Makefile
- src/modules/Makefile
- src/modules/LoDTerrain/Makefile
-diff -up TnL-source-070909/configure~ TnL-source-070909/configure
---- TnL-source-070909/configure~	2007-09-13 21:45:49.000000000 +0200
-+++ TnL-source-070909/configure	2007-09-13 21:45:49.000000000 +0200
-@@ -5653,7 +5653,7 @@ done
+diff -up TnL-source-071111/configure.foo TnL-source-071111/configure
+--- TnL-source-071111/configure.foo	2008-09-07 15:08:34.000000000 +0200
++++ TnL-source-071111/configure	2008-09-07 15:08:44.000000000 +0200
+@@ -5752,7 +5752,7 @@ done
  
  
  
@@ -21,7 +10,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -6243,7 +6243,6 @@ do
+@@ -6342,7 +6342,6 @@ do
      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
      "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -29,24 +18,35 @@
      "src/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES src/interfaces/Makefile" ;;
      "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;;
      "src/modules/LoDTerrain/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/LoDTerrain/Makefile" ;;
-diff -up TnL-source-070909/src/Makefile.in~ TnL-source-070909/src/Makefile.in
---- TnL-source-070909/src/Makefile.in~	2007-09-14 07:08:48.000000000 +0200
-+++ TnL-source-070909/src/Makefile.in	2007-09-14 07:08:48.000000000 +0200
-@@ -211,7 +211,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = modules boost interfaces
-+SUBDIRS = modules interfaces
- tnl_bin_SOURCES = game.cc game.h tnl.h \
-                         Factory.h \
-                         initControls.cc \
-diff -up TnL-source-070909/src/Makefile.am~ TnL-source-070909/src/Makefile.am
---- TnL-source-070909/src/Makefile.am~	2007-09-14 07:08:29.000000000 +0200
-+++ TnL-source-070909/src/Makefile.am	2007-09-14 07:08:29.000000000 +0200
+diff -up TnL-source-071111/configure.in.foo TnL-source-071111/configure.in
+--- TnL-source-071111/configure.in.foo	2008-09-07 15:08:34.000000000 +0200
++++ TnL-source-071111/configure.in	2008-09-07 15:08:44.000000000 +0200
+@@ -153,7 +153,6 @@ AC_CONFIG_FILES([
+ Makefile
+ scripts/Makefile
+ src/Makefile
+-src/boost/Makefile
+ src/interfaces/Makefile
+ src/modules/Makefile
+ src/modules/LoDTerrain/Makefile
+diff -up TnL-source-071111/src/Makefile.am.foo TnL-source-071111/src/Makefile.am
+--- TnL-source-071111/src/Makefile.am.foo	2008-09-07 15:08:34.000000000 +0200
++++ TnL-source-071111/src/Makefile.am	2008-09-07 15:08:44.000000000 +0200
 @@ -1,4 +1,4 @@
 -SUBDIRS = modules boost interfaces
 +SUBDIRS = modules interfaces
  
  bin_PROGRAMS = tnl-bin
  
+diff -up TnL-source-071111/src/Makefile.in.foo TnL-source-071111/src/Makefile.in
+--- TnL-source-071111/src/Makefile.in.foo	2008-09-07 15:08:34.000000000 +0200
++++ TnL-source-071111/src/Makefile.in	2008-09-07 15:08:44.000000000 +0200
+@@ -214,7 +214,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = modules boost interfaces
++SUBDIRS = modules interfaces
+ tnl_bin_SOURCES = game.cc game.h tnl.h \
+                         glew.c glew.h \
+                         CEGUIEventFilter.cc CEGUIEventFilter.h \


Index: TnL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TnL/devel/TnL.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TnL.spec	11 Jul 2008 06:40:54 -0000	1.8
+++ TnL.spec	7 Sep 2008 13:10:39 -0000	1.9
@@ -7,7 +7,7 @@
 
 Name:           TnL
 Version:        071111
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Thunder & Lightning - A futuristic action flight simulator game
 Group:          Amusements/Games
 License:        GPL+
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 071111-7
+- Fix patch fuzz build failure
+
 * Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 071111-6
 - Rebuild for new cegui