- install icon to pixmapsdir to avoid invoking gtk-update-icon-cache in %post in...

Changed files:
    clementine.spec -> 1.3
    desktop-install.patch -> 1.1

diff --git a/clementine.spec b/clementine.spec
index ae8d982df3a216ad2c5f18209d48eaf80fc3c9aa..cd75771a0b3e15d3482c864b5a3d22cb3260601c 100644 (file)
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,7 +1,7 @@
 Summary:       A music player and library organiser
 Name:          clementine
 Version:       0.2
-Release:       0.1
+Release:       0.2
 License:       GPL v3 and GPL v2+
 Group:         Applications/Multimedia
 URL:           http://code.google.com/p/clementine-player
@@ -9,9 +9,10 @@ Source0:       http://clementine-player.googlecode.com/files/%{name}_%{version}-1.tar.
 # Source0-md5: bf89adb26808fec6201499375de95507
 Patch0:                %{name}-dont-bundle-external-lib.patch
 Patch1:                %{name}-static.patch
+Patch2:                desktop-install.patch
 BuildRequires: QtSingleApplication-devel
 BuildRequires: boost-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6
 BuildRequires: desktop-file-utils
 BuildRequires: gtest-devel
 BuildRequires: liblastfm-devel
@@ -34,12 +35,13 @@ advantage of Qt4.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # We already don't use these but just to make sure
 rm -fr 3rdparty
 
-# Don't build tests. They require gmock which is not yet available on Fedora
-sed -i '/tests/d' CMakeLists.txt
+# Don't build tests. They require gmock
+sed -i -e '/tests/d' CMakeLists.txt
 
 %build
 install -d build
@@ -62,4 +64,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changelog TODO
 %attr(755,root,root) %{_bindir}/clementine
 %{_desktopdir}/clementine.desktop
-%{_iconsdir}/hicolor/*/apps/application-x-clementine.png
+%{_pixmapsdir}/clementine.png

diff --git a/desktop-install.patch b/desktop-install.patch
new file mode 100644 (file)
index 0000000..44f50a2
--- /dev/null
+++ b/desktop-install.patch
@@ -0,0 +1,24 @@
+--- clementine-0.2/dist/clementine.desktop~    2010-01-18 00:12:17.000000000 +0200
++++ clementine-0.2/dist/clementine.desktop     2010-04-24 14:09:59.250159909 +0300
+@@ -6,7 +6,7 @@
+ Comment=Plays music and last.fm streams
+ Exec=clementine
+ TryExec=clementine
+-Icon=application-x-clementine
++Icon=clementine
+ Terminal=false
+ Categories=AudioVideo;Player;Qt;
+ StartupNotify=false
+--- clementine-0.2/src/CMakeLists.txt~ 2010-04-23 22:14:47.000000000 +0300
++++ clementine-0.2/src/CMakeLists.txt  2010-04-24 14:07:29.951424256 +0300
+@@ -253,8 +253,8 @@
+ )
+   
+ install(FILES ../dist/clementine_64.png
+-  DESTINATION share/icons/hicolor/64x64/apps/
+-  RENAME application-x-clementine.png
++  DESTINATION share/pixmaps
++  RENAME clementine.png
+ )
+ 
+ install(FILES ../dist/clementine.desktop