SPECS: amarok.spec - use file based kdialog dependency to work under kde4 -...

glen glen at pld-linux.org
Tue Dec 9 19:52:12 CET 2008


Author: glen                         Date: Tue Dec  9 18:52:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use file based kdialog dependency to work under kde4
- drop sample code; rel 7

---- Files affected:
SPECS:
   amarok.spec (1.196 -> 1.197) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.196 SPECS/amarok.spec:1.197
--- SPECS/amarok.spec:1.196	Mon Dec  8 18:41:38 2008
+++ SPECS/amarok.spec	Tue Dec  9 19:52:07 2008
@@ -30,7 +30,7 @@
 Summary(pl.UTF-8):	Odtwarzacz audio dla KDE
 Name:		amarok
 Version:	1.4.10
-Release:	6
+Release:	7
 License:	GPL
 Group:		X11/Applications/Multimedia
 Source0:	ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
@@ -219,7 +219,7 @@
 Summary(pl.UTF-8):	Skrypty amaroKa
 Group:		X11/Applications/Multimedia
 Requires:	%{name} = %{version}-%{release}
-Requires:	kdebase-kdialog
+Requires:	/usr/bin/kdialog
 Requires:	python-PyQt
 Requires:	ruby-modules
 
@@ -304,6 +304,9 @@
 rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/libamarok.{so,la}
 
+# example plugin code
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/amarok/scripts/templates
+
 [ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
 	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang amarok --all-name --with-kde
@@ -432,11 +435,6 @@
 %{_datadir}/apps/amarok/scripts/common/Publisher.py
 %{_datadir}/apps/amarok/scripts/common/Zeroconf.py
 
-%dir %{_datadir}/apps/amarok/scripts/templates
-%{_datadir}/apps/amarok/scripts/templates/amarok.rb
-%{_datadir}/apps/amarok/scripts/templates/python_qt_template.py
-%{_datadir}/apps/amarok/scripts/templates/ruby_qt_template.rb
-
 # amarok searches for executable programs for scripts
 # to figure out which files need to have execute permission, use this
 # find command:
@@ -454,7 +452,6 @@
 %{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.spec
 %{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.spec
 
-
 %dir %{_datadir}/apps/amarok/scripts/webcontrol
 %{_datadir}/apps/amarok/scripts/webcontrol/README
 %{_datadir}/apps/amarok/scripts/webcontrol/Globals.py
@@ -514,6 +511,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.197  2008/12/09 18:52:07  glen
+- use file based kdialog dependency to work under kde4
+- drop sample code; rel 7
+
 Revision 1.196  2008/12/08 17:41:38  qboosh
 - pl for konqueror-addon-amarok
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.196&r2=1.197&f=u



More information about the pld-cvs-commit mailing list