[stratagus] Start work on updating to 2.2.7

[Bruno Wolff III]

commit 8f61e337e9e1863a00f9c9f486dce28677e6da58
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Dec 1 11:06:11 2013 -0600

    Start work on updating to 2.2.7
    
    2.2.7 fixes some things we were carrying patches for, but also has some
    significant changes that require so new fixes (I haven't done) for
    unbundling guichan. So this is just a start.

 .gitignore     |    1 +
 sources        |    2 +-
 stratagus.spec |   58 ++++++++++++++++++++-----------------------------------
 3 files changed, 23 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b068f3..bd0b066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 stratagus-2.2.4-src.tar.gz
+/stratagus_2.2.7.orig.tar.gz
diff --git a/sources b/sources
index 3d13f23..51aa2cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-311b41c8dcd2d695d2f3ca7d2c17587e  stratagus-2.2.4-src.tar.gz
+48181bf0234d0a2ee4b0e08ae1841477  stratagus_2.2.7.orig.tar.gz
diff --git a/stratagus.spec b/stratagus.spec
index 94b1109..0d6b400 100644
--- a/stratagus.spec
+++ b/stratagus.spec
@@ -1,17 +1,11 @@
 Name:		stratagus
 Summary:	Real-time strategy gaming engine
-Version:	2.2.4
-Release:	16%{?dist}
+Version:	2.2.7
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Development/Libraries
-URL:		http://stratagus.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
-Patch0:		stratagus--use_external_tolua.diff
-Patch1:		stratagus-gcc43.patch
-# currently broken
-Patch2:		stratagus--guichan_external.diff
-Patch3:		stratagus-includes.patch
-Patch4:         stratagus-libpng15.patch
+URL:		https://launchpad.net/stratagus
+Source0:	https://launchpad.net/stratagus/trunk/%{version}/+download/stratagus_%{version}.orig.tar.gz
 BuildRequires:	mikmod-devel
 BuildRequires:	tolua++-devel
 BuildRequires:  lua-devel
@@ -31,40 +25,22 @@ Stratagus is a free cross-platform real-time strategy gaming engine. It
 includes support for playing over the internet/LAN, or playing a
 computer opponent. The engine is configurable and can be used to create
 games with a wide-range of features specific to your needs. See the
-data sets page ( http://stratagus.sourceforge.net/games.shtml ) for a list
-of current games using the stratagus engine.
+home page (https://launchpad.net/stratagus) for a list of current games
+using the stratagus engine.
 
 %prep
-%setup -q
-%patch0
-%patch1 -p1 -b .gcc43
-#%patch2 -p0 -b .guichan
-%patch3 -p1 -b .includes
-%patch4 -p0 -b .libpng15
-dos2unix doc/graphics/stratagus.gimp
-dos2unix doc/scripts/makeindex.py
-dos2unix doc/scripts/showindex.py
-dos2unix doc/scripts/findlua.py
-dos2unix doc/metaserver_protocol.txt
-dos2unix doc/README-SDL.txt
-dos2unix README
+%setup -n stratagus_%{version}.orig
 iconv -f iso8859-1 -t utf8 doc/guichan-copyright.txt > doc/guichan-copyright.utf8 && mv -f doc/guichan-copyright.{utf8,txt}
 
 %build
-%configure	--with-x \
-		--with-bz2 \
-		--with-ogg \
-		--with-mikmod \
-		--with-opengl
-
-%{__make}
+%cmake .
+# --with-x \ --with-bz2 \ --with-ogg \ --with-mikmod \ --with-opengl
+make VERBOSE=1
+#make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-install -D -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
-
-%clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
@@ -72,6 +48,14 @@ install -D -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 %{_bindir}/%{name}
 
 %changelog
+* Sun Dec 01 2013 Bruno Wolff III <bruno at wolff.to> - 2.2.7-1
+- Update to upstream 2.2.7
+- Project has moved from sourceforge to launchpad
+- Changelog: https://launchpad.net/stratagus/+milestone/2.2.7
+- Update supports lua 5.1
+- Update supports libpng 1.6
+- Stratagus has switched to cmake
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild