[TnL] FTBFS fix.

Jon Ciesla limb at fedoraproject.org
Mon Jan 23 18:04:24 UTC 2012


commit e786fbfb577cca7a121f4412642aee348ec2cd74
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jan 23 12:04:12 2012 -0600

    FTBFS fix.

 TnL.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/TnL.spec b/TnL.spec
index 04d7a1e..7e1ff57 100644
--- a/TnL.spec
+++ b/TnL.spec
@@ -7,7 +7,7 @@
 
 Name:           TnL
 Version:        071111
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Thunder & Lightning - A futuristic action flight simulator game
 Group:          Amusements/Games
 License:        GPL+
@@ -18,10 +18,10 @@ Patch0:         TnL-070909-system-boost.patch
 Patch1:         TnL-070909-crash-on-exit.patch
 Patch2:         TnL-source-071111-gcc43.patch
 Patch3:         TnL-071111-openal-compile-fixes.patch
-Patch4:		TnL-071111-cegui.patch
+#Patch4:		TnL-071111-cegui.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  glew-devel libpng-devel libsigc++-devel
-BuildRequires:  SDL-devel Io-language-devel boost-devel cegui-devel
+BuildRequires:  SDL-devel Io-language-devel boost-devel cegui06-devel
 BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10
 BuildRequires:  desktop-file-utils
 Requires:       %{name}-data = %{version}, opengl-games-utils
@@ -46,7 +46,7 @@ scripted events for each island.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
+#%patch4 -p0
 
 # we want to use the system version of boost
 rm -r src/boost
@@ -56,6 +56,7 @@ touch configure config.h.in `find -name Makefile.in`
 
 
 %build
+sed -i s/CEGUI\-OPENGL/CEGUI\-OPENGL\-0\.6/g configure
 %configure --with-io-cflags=-I/usr/include/io --with-io-libs=-liovmall \
    --enable-release
 make %{?_smp_mflags}
@@ -85,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 23 2012 Jon Ciesla <limburgher at gmail.com> - 071111-18
+- FTBFS fix.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 071111-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list