rpms/amarok/devel amarok.spec,1.99,1.100

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
* Thu Feb 21 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.8-4
- -konqueror subpkg (#426803)
- fix multiarch conflicts (#340641)
  drop Provides: amarok-devel (f9+), add Obsoletes: amarok-devel



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- amarok.spec	18 Feb 2008 18:11:07 -0000	1.99
+++ amarok.spec	21 Feb 2008 20:24:23 -0000	1.100
@@ -3,10 +3,18 @@
 
 %define _with_mp4v2 --with-mp4v2
 
+%if 0%{?fedora} < 9 
+%define konq 1
+%endif
+
+%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
+%define _with_helix --with-helix=%{_libdir}/helix
+%endif
+
 Name:       amarok
 Summary:    Media player
 Version:    1.4.8
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -32,10 +40,8 @@
 %ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
 BuildRequires:  HelixPlayer
 %endif
-%if 0%{?fedora} > 8
 BuildRequires:  kdelibs3-devel
-%else
-%define kde3 1
+%if 0%{?konq}
 BuildRequires:  kdebase3-devel
 %endif
 BuildRequires:  taglib-devel 
@@ -71,7 +77,20 @@
 Requires:  xdg-utils
 
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+
+Obsoletes: amarok-devel < %{version}-%{release}
+%if 0%{?fedora} > 6 && 0%{?fedora} < 9
+# need to keep this around for previous releases, so not to break multilib compat.
 Provides:  amarok-devel = %{version}-%{release}
+%endif
+
+# engines, etc...
+# old, obsolete ones: arts, akode
+Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+# xine-lib
+Provides: %{name}-engine-xine = %{version}-%{release}
+
+
 
 
 %description
@@ -86,14 +105,21 @@
 To use the helix engine, you'll have to install either HelixPlayer
 or RealPlayer
 
+%package konqueror
+Summary: Amarok konqueror (service menus, sidebar) support
+Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+# Upgrade path for previous users, where this subpkg didn't yet exist -- Rex
+Obsoletes: %{name} < 1.4.8-4
+%description konqueror
+%{summary}.
 
 %package visualisation
 Summary:    Visualisation plugins for Amarok
 Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 # No plugins by default, we need libvisual-plugins
 Requires:   libvisual-plugins
-
 %description visualisation
 Amarok can use visualisation plugins from different origins.
 Right now, only xmms is supported, which means that you can
@@ -117,9 +143,7 @@
      --enable-postgresql \
      --with-ifp \
      --with-libgpod \
-%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
-     --with-helix=%{_libdir}/helix \
-%endif
+     %{?_with_helix} %{!?_with_helix:--without-helix} \
      %{?_with_gstreamer} \
      %{?_with_mp4v2} %{!?_with_mp4v2:--without-mp4v2}
 
@@ -142,11 +166,8 @@
         --delete-original \
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-#rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
-# Amarok crashes without the *.la files !
-#find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-# Remove the *.la file in /usr/lib though, those are OK to delete
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %find_lang %{name} 
@@ -161,22 +182,22 @@
 
 
 %post
+/sbin/ldconfig
 # update icon themes if necessary
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
-ldconfig
 
 %postun
+/sbin/ldconfig
 # update icon themes if necessary
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
-ldconfig
 
 
 %clean
@@ -194,19 +215,13 @@
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%if 0%{?kde3}
-# these 3 pull in kdebase
-%{_libdir}/kde3/konqsidebar_universalamarok.*
-%{_datadir}/apps/konqsidebartng/*/amarok.desktop
-%endif
-%{_libdir}/libamarok.*
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/libamarok.*
 %{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
@@ -249,17 +264,30 @@
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
 # Helix engine
-%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
+%if 0%{?_with_helix:1}
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
+%if 0%{?konq}
+%files konqueror
+%defattr(-,root,root,-)
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_libdir}/kde3/konqsidebar_universalamarok.*
+%{_datadir}/apps/konqsidebartng/*/amarok.desktop
+%endif
+
 %files visualisation
 %defattr(-,root,root,-)
 %{_bindir}/amarok_libvisual
 
 
 %changelog
+* Thu Feb 21 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.8-4
+- -konqueror subpkg (#426803)
+- fix multiarch conflicts (#340641)
+  drop Provides: amarok-devel (f9+), add Obsoletes: amarok-devel
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.8-3
 - Autorebuild for GCC 4.3