packages: clementine/clementine.spec, clementine/desktop-install.patch (NEW...

[glen]

Author: glen                         Date: Sat Apr 24 11:17:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install icon to pixmapsdir to avoid invoking gtk-update-icon-cache in %post in gnome

---- Files affected:
packages/clementine:
   clementine.spec (1.2 -> 1.3) , desktop-install.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/clementine/clementine.spec
diff -u packages/clementine/clementine.spec:1.2 packages/clementine/clementine.spec:1.3
--- packages/clementine/clementine.spec:1.2	Sat Apr 24 12:15:48 2010
+++ packages/clementine/clementine.spec	Sat Apr 24 13:17:49 2010
@@ -2,7 +2,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
@@ -10,9 +10,10 @@
 # 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
@@ -35,12 +36,13 @@
 %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
@@ -63,7 +65,7 @@
 %doc Changelog TODO
 %attr(755,root,root) %{_bindir}/clementine
 %{_desktopdir}/clementine.desktop
-%{_iconsdir}/hicolor/*/apps/application-x-clementine.png
+%{_pixmapsdir}/clementine.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -71,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/04/24 11:17:49  glen
+- install icon to pixmapsdir to avoid invoking gtk-update-icon-cache in %post in gnome
+
 Revision 1.2  2010/04/24 10:15:48  glen
 - builds
 

================================================================
Index: packages/clementine/desktop-install.patch
diff -u /dev/null packages/clementine/desktop-install.patch:1.1
--- /dev/null	Sat Apr 24 13:17:54 2010
+++ packages/clementine/desktop-install.patch	Sat Apr 24 13:17:49 2010
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clementine/clementine.spec?r1=1.2&r2=1.3&f=u