[redeclipse/f17] update spec for 1.3.1

[Martin Erik Werner]

commit 8bcca7cc45df0ce47c2a3d86e03eba03338bd20a
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Thu Dec 6 15:01:03 2012 +0100

    update spec for 1.3.1

 redeclipse.spec |   52 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 31 insertions(+), 21 deletions(-)
---
diff --git a/redeclipse.spec b/redeclipse.spec
index 36cc751..be1fa1f 100644
--- a/redeclipse.spec
+++ b/redeclipse.spec
@@ -1,8 +1,8 @@
 Summary:        Multiplayer FPS game based on Cube2
 Name:           redeclipse
 Group:          Amusements/Games
-Version:        1.2
-Release:        12%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 
 # Game engine is zlib
 # Icon and trademark info is CC-BY-SA
@@ -10,26 +10,22 @@ Release:        12%{?dist}
 License:        zlib and CC-BY-SA
 URL:            http://www.redeclipse.net/
 
-#Source0:        http://downloads.sourceforge.net/%%{name}/%%{name}_%%{version}_linux_bsd.tar.bz2
+#Source0:        http://downloads.sourceforge.net/%%{name}/%%{name}_%%{version}_nix.tar.bz2
 Source0:        %{name}-%{version}-fs.tar.xz
 # Upstream tarball contains some non-free and superfluous content,
 # it is removed in the Fedora sources using:
 # sh redeclipse-generate-tarball.sh <version>
 Source1:        %{name}-generate-tarball.sh
-# Exhaustive license breakdown for game data
-Source2:        all-licenses
+
 # Start game windowed on first launch
 # due to the sorry state of sdl + fullscreen on GNU/Linux
 # Not wanted upstream
-
-Patch0:         %{name}-%{version}-windowed-by-default.patch
-# Fix x48 and x32 icons, add x16 icon
-# Fix from upstream SVN
-Patch1:         %{name}-%{version}-backported-fix-icon-sizes.patch
+Patch0:         %{name}-windowed-by-default.patch
 # Build using external Enet library from Fedora
 # Not wanted upstream
-Patch2:         %{name}-%{version}-build-with-system-enet.patch
-Patch3:         %{name}-%{version}-security-text-command-fix.patch
+Patch1:         %{name}-build-with-system-enet.patch
+# Small fix from upstream SVN
+Patch2:         %{name}-%{version}-system-install-fix-cube2font-targets.patch
 
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
@@ -65,7 +61,7 @@ Summary:        Data for the Red Eclipse FPS game
 # Game scripts are zlib
 # Trademark info is CC-BY-SA
 # Game data is mixed (per-directory readme.txt), by default CC-BY-SA
-# See the included file 'all-licenses' for license breakdown
+# See the included file 'doc/all-licenses.txt' for license breakdown
 # Logo and name covered by "trademark guidelines" see trademark.txt
 License:        zlib and CC-BY-SA and CC-BY and Public Domain and OFL
 BuildArch:      noarch
@@ -103,11 +99,9 @@ previous TTF2Font, supporting a much larger range of characters.
 
 %prep
 %setup -q -n redeclipse
-cp %{SOURCE2} .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 
 %build
@@ -117,7 +111,7 @@ make %{?_smp_mflags} CXXFLAGS="%{optflags}" -C src/                    \
 
 %install
 make %{?_smp_mflags} CXXFLAGS="%{optflags}" -C src/                    \
-        DESTDIR=%{buildroot} redeclipse=%{name} prefix=%{_prefix}      \
+        DESTDIR=%{buildroot} prefix=%{_prefix}                         \
         libexecdir=%{buildroot}%{_libexecdir}                          \
         system-install system-install-cube2font
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -139,28 +133,31 @@ fi
 
 
 %files
-%doc readme.txt changelog.txt license.txt trademark.txt
+%doc readme.txt doc/changelog.txt doc/license.txt doc/trademark.txt
 %{_bindir}/%{name}
 %dir %{_libexecdir}/%{name}/
 %{_libexecdir}/%{name}/%{name}
 %{_libexecdir}/%{name}/data
 %{_datadir}/icons/*
+%{_datadir}/pixmaps/*
 %{_datadir}/applications/*
+%dir %{_docdir}/%{name}/
+%{_docdir}/%{name}/guidelines.txt
 %{_mandir}/man6/%{name}.6.*
 
 
 %files data
-%doc license.txt trademark.txt
-%doc all-licenses
+%doc doc/license.txt doc/all-licenses.txt doc/trademark.txt
 %{_datadir}/%{name}/
 
 
 %files server
-%doc license.txt trademark.txt
+%doc doc/license.txt doc/trademark.txt
 %{_bindir}/%{name}-server
 %dir %{_libexecdir}/%{name}/
 %{_libexecdir}/%{name}/%{name}-server
-%{_docdir}/%{name}/
+%{_docdir}/%{name}/examples/
+%{_docdir}/%{name}/guidelines.txt
 %{_mandir}/man6/%{name}-server.6.*
 
 
@@ -170,6 +167,19 @@ fi
 
 
 %changelog
+* Thu Dec 06 2012 Martin Erik Werner <martinerikwerner at gmail.com>
+- 1.3.1-1
+- New upstream release
+- Remove security text command fix patch
+  + Applied upstream
+- Remove icon patch
+  + Applied upstream
+- Remove all-licenses
+  + Installed from upstream
+- Removed versioning on windowed and enet patches
+- Add patch for cube2font install target
+
+
 * Fri Jul 27 2012 Martin Erik Werner <martinerikwerner at gmail.com>
 - 1.2-12
 - Add security-text-command-fix.patch