[wesnoth] Build fix.

Jon Ciesla limb at fedoraproject.org
Mon Nov 26 19:29:17 UTC 2012


commit 7ce17b4ded13017ebc883633f693cc87b48304a7
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Nov 26 13:27:15 2012 -0600

    Build fix.

 wesnoth.spec |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/wesnoth.spec b/wesnoth.spec
index f5ba23b..91fa00e 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -3,7 +3,7 @@
 
 Name:           wesnoth
 Version:        1.10.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -35,7 +35,7 @@ BuildRequires:  gettext
 BuildRequires:  boost-devel
 BuildRequires:  pango-devel
 BuildRequires:  lua-devel
-BuildRequires:  cmake
+BuildRequires:  scons
 # Drop these when ogg test patch is removed.
 #BuildRequires:  autoconf
 #BuildRequires:  automake
@@ -121,12 +121,13 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 #    --with-server-uid=$(id -u) \
 #    --with-server-gid=$(id -g) \
 #    --disable-strict-compilation
-cmake . -DCMAKE_INSTALL_PREFIX=${RPM_BUILD_ROOT}%{_prefix} -DDATAROOTDIR=%{_datadir} -DBINDIR=%{_bindir} -DENABLE_TOOLS=ON -DSERVER_UID=$(id -u) -DSERVER_GID=$(id -g) -DCMAKE_INSTALL_PREFIX=%{RPM_BUILD_ROOT}
+
+##%%cmake . -DCMAKE_INSTALL_PREFIX=${RPM_BUILD_ROOT}%{_prefix} -DDATAROOTDIR=%{_datadir} -DBINDIR=%{_bindir} -DENABLE_TOOLS=ON -DSERVER_UID=$(id -u) -DSERVER_GID=$(id -g) -DCMAKE_INSTALL_PREFIX=%{RPM_BUILD_ROOT} -DENABLE_NLS=ON
 %ifnarch noarch
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+scons all prefix=/usr
 %endif
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 #make install
@@ -188,9 +189,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man6
 pushd doc
 pushd man
 rm CMakeLists.txt
-rm cmake_install.cmake
-rm -rf CMakeFiles/
-rm Makefile
+#rm cmake_install.cmake
+#rm -rf CMakeFiles/
+#rm Makefile
 mv *.6 $RPM_BUILD_ROOT/%{_mandir}/man6/
 for i in *; do
 	pushd $i
@@ -347,6 +348,9 @@ fi
 #%endif
 
 %changelog
+* Tue Nov 20 2012 Jon Ciesla <limburgher at gmail.com> - 1.10.5-2
+- Switched from cmake to scons to fix build issue.
+
 * Tue Nov 20 2012 Jon Ciesla <limburgher at gmail.com> - 1.10.5-1
 - New upstream maintainance release.
 


More information about the scm-commits mailing list