[tong] Update to 1.2

[Jaromír Cápík]

commit dbaea2a2e9bf531122d2ad509f86091b2e0f1361
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Mon Oct 29 17:54:17 2012 +0100

    Update to 1.2

 .gitignore   |    1 +
 sources      |    2 +-
 tong.desktop |    2 +-
 tong.spec    |   39 +++++++++++++++++----------------------
 4 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 953341d..63fc78a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tong-1.0.tar.gz
+/tong-1.2.tar.gz
diff --git a/sources b/sources
index 1047b3d..3b96794 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f358a012639de1a5a8d3e0b323438de  tong-1.0.tar.gz
+551bd22736b59bf4a1f92ff83cc7e17c  tong-1.2.tar.gz
diff --git a/tong.desktop b/tong.desktop
index e691c7a..7c86a73 100644
--- a/tong.desktop
+++ b/tong.desktop
@@ -4,7 +4,7 @@ Name=Tong
 GenericName=Tong
 Comment=A mixture of two popular games
 Exec=tong
-Icon=tong-icon.png
+Icon=tong-icon
 Terminal=false
 Type=Application
 Categories=Game;BlocksGame;
diff --git a/tong.spec b/tong.spec
index 4fe70ed..27081b8 100644
--- a/tong.spec
+++ b/tong.spec
@@ -1,20 +1,19 @@
 Name:           tong
-Version:        1.0
-Release:        16%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A mixture of two classic games
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.nongnu.org/tong
-Source0:        http://www.nongnu.org/tong/tong-1.0.tar.gz
+Source0:        http://www.nongnu.org/tong/tong-%{version}.tar.gz
 Source1:        tong-icon.png
 Source2:        tong.desktop
 Patch0:         tong-chdir.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  SDL_image-devel SDL_mixer-devel
-Requires:       tong-data
+Requires:       tong-data = %{version}-%{release}
 
 %description
 TONG is the result of intermixing two classic games, capitalizing on the
@@ -30,35 +29,30 @@ Data files for the Tong game.
 
 
 %prep
-%setup -q
-%patch0 -b .orig
+%setup -q -n %{name}
 
 %build
-make CC="%{__cxx} $RPM_OPT_FLAGS" GAME_DATA_DIR=%{_datadir}/tong %{?_smp_mflags}
-
+make CC="%{__cxx} $RPM_OPT_FLAGS" GAME_DATA_DIR="%{_datadir}/tong" %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+# Unfortunately, the Makefile does not contain an install: target
+# -> we have to install the files by ourselves.
 
-# Unfortunately, the Makefile does not contain an install: target so we
-# have to install the files ourselves.
+# binary
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-
 install -pD tong $RPM_BUILD_ROOT%{_bindir}/tong
 
-for i in media/* ; do
-    install -pD $i $RPM_BUILD_ROOT%{_datadir}/tong/$i
-done
+# data
+install -d $RPM_BUILD_ROOT%{_datadir}/tong
+cp -pr media $RPM_BUILD_ROOT%{_datadir}/tong/
 
+# desktop stuff & icons
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         %{SOURCE2}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -73,17 +67,18 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/tong
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/32x32/apps/tong-icon.png
-%doc COPYING CREDITS making-of.txt
+%doc COPYING CREDITS README making-of.txt
 
 %files data
-%defattr(-,root,root,-)
 %{_datadir}/tong
 
 %changelog
+* Wed Oct 29 2012 Jaromir Capik <jcapik at redhat.com> - 1.2-1
+- Update to 1.2
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild