[puzzle-master/f15] Updated to 1.2.3

[Timur Kristóf]

commit 26c838aaf18121b8c107f7391770b0fd983da55b
Author: Timur Kristóf <venemo at msn.com>
Date:   Thu May 19 22:33:25 2011 +0200

    Updated to 1.2.3

 .gitignore         |    1 +
 puzzle-master.spec |   21 +++++++++++++++------
 sources            |    2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c1f606..eb247f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /puzzle-master-1.2.2.tar.gz
+/puzzle-master-1.2.3.tar.gz
diff --git a/puzzle-master.spec b/puzzle-master.spec
index 963855f..e77c4d1 100644
--- a/puzzle-master.spec
+++ b/puzzle-master.spec
@@ -1,11 +1,12 @@
 Name:           puzzle-master
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.2.3
+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
+URL:            https://gitorious.org/colorful-apps/pages/PuzzleMaster
+
 # 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:
@@ -25,8 +26,12 @@ You can decide the size and thus the difficulty of the puzzle.
 %setup -q
 
 %build
+# This ensures that the files will be placed to the correct location
+QMAKEFLAGS=' -after target.path=%{_bindir}'
+QMAKEFLAGS+=' -after desktopfile.path=%{_datadir}/applications'
+QMAKEFLAGS+=' -after iconfile.path=%{_datadir}/pixmaps'
 # This will find qmake on both Fedora and MeeGo
-qmake-qt4 || qmake
+`qmake-qt4 $QMAKEFLAGS` || `qmake $QMAKEFLAGS`
 make %{?_smp_mflags}
 
 %install
@@ -42,10 +47,14 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %doc LICENSE
 
 %changelog
-* 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.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..694f224 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5834a31b685c7ad1fd0c56dae01970dc  puzzle-master-1.2.2.tar.gz
+fc9f6ffe3adaa6b2b9619aa392b95c1c  puzzle-master-1.2.3.tar.gz