packages: amarok/amarok.spec - BR: qjson-devel >= 0.5 for Playdar Collectio...

lisu lisu at pld-linux.org
Fri Jul 1 15:49:47 CEST 2011


Author: lisu                         Date: Fri Jul  1 13:49:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR: qjson-devel >= 0.5 for Playdar Collection
- dropped Titanium conditions

---- Files affected:
packages/amarok:
   amarok.spec (1.251 -> 1.252) 

---- Diffs:

================================================================
Index: packages/amarok/amarok.spec
diff -u packages/amarok/amarok.spec:1.251 packages/amarok/amarok.spec:1.252
--- packages/amarok/amarok.spec:1.251	Fri Jul  1 15:38:36 2011
+++ packages/amarok/amarok.spec	Fri Jul  1 15:49:42 2011
@@ -42,6 +42,7 @@
 BuildRequires:	pcre-devel
 BuildRequires:	pkgconfig
 BuildRequires:	qca-devel
+BuildRequires:	qjson-devel >= 0.5
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	qtscriptbindings
@@ -212,9 +213,7 @@
 %attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_lastfm.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_magnatunestore.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_amarok_service_mp3tunes.so
-%if "%{pld_release}" != "ti"
 %attr(755,root,root) %{_libdir}/kde4/amarok_collection-playdarcollection.so
-%endif
 %attr(755,root,root) %{_libdir}/kde4/amarok_collection-upnpcollection.so
 %attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_tabs.so
 %attr(755,root,root) %{_libdir}/kde4/amarok_data_engine_tabs.so
@@ -285,9 +284,7 @@
 %{_datadir}/kde4/services/amarok-scriptengine-runner-javascript.desktop
 %{_datadir}/kde4/services/amarok-context-applet-tabs.desktop
 %{_datadir}/kde4/services/amarok-data-engine-tabs.desktop
-%if "%{pld_release}" != "ti"
 %{_datadir}/kde4/services/amarok_collection-playdarcollection.desktop
-%endif
 %{_datadir}/kde4/services/amarok_collection-upnpcollection.desktop
 %{_datadir}/kde4/servicetypes/amarok_codecinstall.desktop
 %{_datadir}/kde4/servicetypes/amarok_context_applet.desktop
@@ -324,6 +321,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.252  2011/07/01 13:49:42  lisu
+- BR: qjson-devel >= 0.5 for Playdar Collection
+- dropped Titanium conditions
+
 Revision 1.251  2011/07/01 13:38:36  lisu
 - some files don't want to appera in Titanium, add conditions
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.251&r2=1.252&f=u



More information about the pld-cvs-commit mailing list