[rott] New upstream release 1.1.2

[Hans de Goede]

commit fd8d684a55fa347d10911eeed84e027eb2546a5d
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sun Jun 15 14:17:43 2014 +0200

    New upstream release 1.1.2
    
    - Fix FTBFS (rhbz#1037308)

 .gitignore                           |    1 +
 rott-1.1-fix-end-level-display.patch |   21 --------
 rott-1.1-gameover.patch              |   85 ----------------------------------
 rott.spec                            |   38 ++++++----------
 sources                              |    2 +-
 5 files changed, 16 insertions(+), 131 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 245929b..a0b508c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 rott-1.1.tar.gz
+/rott-1.1.2.tar.gz
diff --git a/rott.spec b/rott.spec
index 974f10e..bef4bc0 100644
--- a/rott.spec
+++ b/rott.spec
@@ -1,11 +1,11 @@
 Name:           rott
-Version:        1.1
-Release:        10%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Rise of the Triad
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://icculus.org/rott/
-Source0:        http://icculus.org/rott/releases/rott-1.1.tar.gz
+Source0:        http://icculus.org/rott/releases/rott-%{version}.tar.gz
 Source1:        rott-shareware.sh
 Source2:        rott-registered.sh
 Source3:        rott.autodlrc
@@ -15,11 +15,6 @@ Source5:        rott-registered.desktop
 # free datafiles. I believe this constitues fair-use. If anyone disagrees let
 # me know and I'll remove it
 Source6:        rott.png
-Patch0:         rott-1.1-gameover.patch
-Patch1:         rott-1.1-fix-end-level-display.patch
-# Note: this gets applied during build, not during prep!
-Patch99:        rott-1.0-registered.patch 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel desktop-file-utils
 
 %description
@@ -63,8 +58,6 @@ from this dir.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 cp -a doc/rott.6 rott-shareware.6
 cp -a doc/rott.6 rott-registered.6
@@ -76,18 +69,17 @@ touch -r rott-registered.6.orig rott-registered.6
 
 %build
 pushd rott
-make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign"
-mv rott rott-shareware.bin
-
-patch -p2 < %{PATCH99}
-make clean
-make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign"
-mv rott rott-registered.bin
+make %{?_smp_mflags} \
+  EXTRACFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign" \
+  ROTT=rott-shareware.bin
+make tidy
+make %{?_smp_mflags} \
+  EXTRACFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign" \
+  ROTT=rott-registered.bin SHAREWARE=0 SUPERROTT=1
 popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 #no make install target, DIY
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -119,10 +111,6 @@ install -p -m 644 %{SOURCE6} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post shareware
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -149,7 +137,6 @@ fi
 
 
 %files shareware
-%defattr(-,root,root,-)
 %doc README COPYING doc/*.txt
 %{_bindir}/rott-shareware*
 %{_mandir}/man6/%{name}-shareware.6*
@@ -163,7 +150,6 @@ fi
 
 
 %files registered
-%defattr(-,root,root,-)
 %doc README COPYING doc/*.txt
 %{_bindir}/rott-registered*
 %{_mandir}/man6/%{name}-registered.6*
@@ -176,6 +162,10 @@ fi
 
 
 %changelog
+* Sun Jun 15 2014 Hans de Goede <hdegoede at redhat.com> - 1.1.2-1
+- New upstream release 1.1.2
+- Fix FTBFS (rhbz#1037308)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index a10efa0..c3d62a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e4940c364ecfae86375b7b1a77860d9  rott-1.1.tar.gz
+d523c7c6c97f95ba84b8cf4deae7db38  rott-1.1.2.tar.gz