rpms/amarok/devel amarok.spec,1.96,1.97

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601

Modified Files:
	amarok.spec 
Log Message:
* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.8-2
- f9+: don't build/include konq(3) side bar support



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- amarok.spec	21 Dec 2007 01:21:05 -0000	1.96
+++ amarok.spec	10 Jan 2008 03:38:31 -0000	1.97
@@ -6,7 +6,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.8
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -32,7 +32,12 @@
 %ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
 BuildRequires:  HelixPlayer
 %endif
+%if 0%{?fedora} > 8
+BuildRequires:  kdelibs3-devel
+%else
+%define kde3 1
 BuildRequires:  kdebase3-devel
+%endif
 BuildRequires:  taglib-devel 
 BuildRequires:  libifp-devel
 # Ipod
@@ -185,14 +190,17 @@
 %{_bindir}/amarokapp
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
-%{_datadir}/apps/%{name}
+%{_datadir}/apps/amarok/
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
+%if 0%{?kde3}
+# these 3 pull in kdebase
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_libdir}/kde3/konqsidebar_universalamarok.*
-%{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
+%endif
+%{_libdir}/libamarok.*
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
@@ -252,6 +260,9 @@
 
 
 %changelog
+* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.8-2
+- f9+: don't build/include konq(3) side bar support
+
 * Thu Dec 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.8-1
 - amarok-1.4.8