[puzzle-master] Updated to upstream release v2.0.0

[Timur Kristóf]

commit 4618d5ffdb94f5385dd7a17f26c007f6b61f71f5
Author: Timur Kristóf <venemo at msn.com>
Date:   Sun Feb 5 19:30:38 2012 +0100

    Updated to upstream release v2.0.0

 .gitignore         |    1 +
 puzzle-master.spec |   48 +++++++++++++++++++++++++++++++++---------------
 sources            |    2 +-
 3 files changed, 35 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c1f606..668dc4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /puzzle-master-1.2.2.tar.gz
+/puzzle-master-2.0.0.tar.gz
diff --git a/puzzle-master.spec b/puzzle-master.spec
index cd1c174..e2cd563 100644
--- a/puzzle-master.spec
+++ b/puzzle-master.spec
@@ -1,32 +1,38 @@
 Name:           puzzle-master
-Version:        1.2.2
-Release:        3%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Fun and addictive jigsaw puzzle game
 
 Group:          Amusements/Games
-License:        EUPL 1.1
-URL:            http://gitorious.org/colorful-apps/puzzle-master
-# The upstream release tarballs can be found here:
-Source0:        http://venemo.fedorapeople.org/sources/%{name}-%{version}.tar.gz
-# You can also re-generate this tarball from the SCM:
-# %{name} refers to the package name and %{version} to the release version 
+License:        GPLv2+
+URL:            http://puzzle-master.colorful.hu/
+
+Source0:        %{name}-%{version}.tar.gz
+# This package is generated from upstream's SCM, in the following way;
+# %{name} refers to the package name and %{version} to the release version.
+#
 # git clone git://gitorious.org/colorful-apps/%{name}.git; cd %{name};
 # git archive --format=tar --prefix=%{name}-%{version}/ v%{version} | gzip -n > %{name}-%{version}.tar.gz
 
-BuildRequires: pkgconfig(QtCore), pkgconfig(QtGui), pkgconfig(QtOpenGL)
+BuildRequires: pkgconfig(QtCore), pkgconfig(QtGui), pkgconfig(QtOpenGL), pkgconfig(QtDeclarative)
 BuildRequires: desktop-file-utils
 
-%description 
+%description
 %{name} is a jigsaw puzzle game that lets you use your own
 images (and contains some built-in ones) for generating puzzles.
-You can decide the size and thus the difficulty of the puzzle.
+You can decide the size and the difficulty of the puzzle.
 
 %prep
 %setup -q
 
 %build
+# This ensures that the files will be placed to the correct location
+QMAKEFLAGS=''
+QMAKEFLAGS+=' -after target.path=%{_bindir}'
+QMAKEFLAGS+=' -after desktopfile.path=%{_datadir}/applications'
+QMAKEFLAGS+=' -after iconfile.path=%{_datadir}/icons/hicolor/scalable/apps'
 # This will find qmake on both Fedora and MeeGo
-qmake-qt4 || qmake
+qmake-qt4 $QMAKEFLAGS || qmake $QMAKEFLAGS
 make %{?_smp_mflags}
 
 %install
@@ -38,17 +44,29 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %attr(644,root,root) %{_datadir}/applications/%{name}.desktop
-%attr(644,root,root) %{_datadir}/pixmaps/%{name}.png
+%attr(644,root,root) %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %doc LICENSE
+%doc LICENSE-DOCS
 
 %changelog
+* Sun Feb 5 2012 Timur Kristóf <venemo at fedoraproject.org> 2.0.0-1
+- Using new upstream release 2.0.0
+- Changed file path for the icon
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Sun May 4 2011 Timur Kristóf <venemo at fedoraproject.org> 1.2.2-2
+* Sat May 7 2011 Timur Kristóf <venemo at fedoraproject.org> 1.2.4-1
+- Using new upstream release 1.2.4
+
+* Sat May 7 2011 Timur Kristóf <venemo at fedoraproject.org> 1.2.3-1
+- Using new upstream release 1.2.3
+- Ensuring proper placement of the files with some qmake flags
+
+* Wed May 4 2011 Timur Kristóf <venemo at fedoraproject.org> 1.2.2-2
 - Fixed the issues raised during the review process, see
   https://bugzilla.redhat.com/show_bug.cgi?id=701785
 
-* Sun May 3 2011 Timur Kristóf <venemo at fedoraproject.org> 1.2.2-1
+* Tue May 3 2011 Timur Kristóf <venemo at fedoraproject.org> 1.2.2-1
 - Initial version of the RPM package, using latest upstream 1.2.2 version.
 
diff --git a/sources b/sources
index ae5987c..1e4401f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5834a31b685c7ad1fd0c56dae01970dc  puzzle-master-1.2.2.tar.gz
+8443fe7be4e420c7d76fe1e5f1559580  puzzle-master-2.0.0.tar.gz