packages: clementine/clementine.spec - package panel icons; rel 2

glen glen at pld-linux.org
Tue Dec 21 18:08:17 CET 2010


Author: glen                         Date: Tue Dec 21 17:08:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package panel icons; rel 2

---- Files affected:
packages/clementine:
   clementine.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/clementine/clementine.spec
diff -u packages/clementine/clementine.spec:1.31 packages/clementine/clementine.spec:1.32
--- packages/clementine/clementine.spec:1.31	Mon Dec 20 11:53:31 2010
+++ packages/clementine/clementine.spec	Tue Dec 21 18:08:12 2010
@@ -21,7 +21,7 @@
 Summary(hu.UTF-8):	Egy zenelejátszó és gyűjtemény-kezelő
 Name:		clementine
 Version:	0.6
-Release:	1
+Release:	2
 License:	GPL v3 and GPL v2+
 Group:		Applications/Multimedia
 URL:		http://www.clementine-player.org/
@@ -31,7 +31,6 @@
 Patch1:		unbundle-po.patch
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtDBus-devel >= %{qtver}
-BuildRequires:	pkgconfig
 BuildRequires:	QtGui-devel >= %{qtver}
 BuildRequires:	QtIOCompressor-devel
 BuildRequires:	QtNetwork-devel >= %{qtver}
@@ -43,7 +42,6 @@
 BuildRequires:	QtXmlPatterns-devel >= %{qtver}
 BuildRequires:	boost-devel
 BuildRequires:	cmake >= 2.6
-#BuildRequires:	desktop-file-utils
 #%{?with_static_projectm:BuildRequires:	ftgl-devel >= 2.1.3}
 BuildRequires:	gettext-devel
 %{?with_static_projectm:BuildRequires:	glew-devel}
@@ -53,6 +51,7 @@
 BuildRequires:	gtest-devel
 BuildRequires:	libgpod-devel >= 0.7.92
 BuildRequires:	libimobiledevice-devel
+BuildRequires:	libindicate-qt-devel
 BuildRequires:	liblastfm-devel
 BuildRequires:	libmtp-devel
 BuildRequires:	libnotify-devel
@@ -65,17 +64,19 @@
 BuildRequires:	phonon
 %{?with_engine_phonon:BuildRequires:	phonon-devel}
 BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-linguist
 BuildRequires:	qt4-qmake
 BuildRequires:	rpmbuild(find_lang) = 1.33
-BuildRequires:	rpmbuild(macros) >= 1.577
+BuildRequires:	rpmbuild(macros) >= 1.596
 BuildRequires:	sed >= 4.0
 %{!?with_static_sqlite:BuildRequires:	sqlite3-devel}
 BuildRequires:	taglib-devel >= 1.6
 BuildRequires:	usbmuxd-devel
 %{?with_engine_vlc:BuildRequires:	vlc-devel}
 %{?with_engine_xine:BuildRequires:	xine-lib-devel}
+Requires:	hicolor-icon-theme
 Requires(post,postun):	desktop-file-utils
 Requires:	QtSingleApplication >= 2.6-4
 %{!?with_static_sqlite:Requires:	QtSql-sqlite3 >= %{qtver}}
@@ -115,7 +116,6 @@
 
 %build
 install -d build
-install -d build/src/translations
 cd build
 %cmake \
 	-DBUNDLE_PROJECTM_PRESETS=OFF \
@@ -139,14 +139,23 @@
 
 %find_lang %{name} --with-qm
 
+install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps
+cp -a $RPM_BUILD_ROOT{%{_datadir}/icons/ubuntu-mono-light/apps/24,%{_iconsdir}/hicolor/24x24/apps}/clementine-panel-grey.png
+cp -a $RPM_BUILD_ROOT{%{_datadir}/icons/ubuntu-mono-light/apps/24,%{_iconsdir}/hicolor/24x24/apps}/clementine-panel.png
+
+# don't want to depend on ubuntu themes
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/ubuntu-*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -154,6 +163,8 @@
 %attr(755,root,root) %{_bindir}/clementine
 %{_desktopdir}/clementine.desktop
 %{_pixmapsdir}/clementine.png
+%{_iconsdir}/hicolor/*/apps/clementine-panel-grey.png
+%{_iconsdir}/hicolor/*/apps/clementine-panel.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -161,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/12/21 17:08:12  glen
+- package panel icons; rel 2
+
 Revision 1.31  2010/12/20 10:53:31  glen
 - strict qt deps:
   Cannot mix incompatible Qt library (version 0x1040700) with this library (version 0x1040701)
================================================================

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



More information about the pld-cvs-commit mailing list