From 108197dd44ae9835826cac72ad932c4f8bd544b9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Nov 01 2007 16:00:25 +0000
Subject: sync w/devel (kde-3.5.8)


---

diff --git a/kdemultimedia-3.5.7-pthread.patch b/kdemultimedia-3.5.7-pthread.patch
new file mode 100644
index 0000000..70e2fe9
--- /dev/null
+++ b/kdemultimedia-3.5.7-pthread.patch
@@ -0,0 +1,11 @@
+--- kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am.pthread	2006-07-22 03:10:54.000000000 -0500
++++ kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am	2007-06-28 06:50:53.000000000 -0500
+@@ -8,7 +8,7 @@
+ 			  xinePlayObject_impl.cpp \
+ 			  audio_fifo_out.c
+ libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
+-libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \
++libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) \
+ 			 -lkmedia2_idl -lsoundserver_idl -lartsflow
+ 
+ libarts_xine_la_METASOURCES = AUTO
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 6d884b4..ff05adf 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -26,7 +26,7 @@ Name:    kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE)
 Epoch:   6
 Version: 3.5.8
-Release: 4%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -57,10 +57,9 @@ Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
 Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+%endif
 
 BuildRequires: zlib-devel
 BuildRequires: kdelibs3-devel >= %{version}
@@ -110,10 +109,12 @@ noatun plugins.
 Summary: Extra applications from %{name} 
 Group: Applications/Multimedia
 %if 0%{?libs}
-Requires: %{name}-extras-libs- = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
 Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  %{name}-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 %endif
 %description extras
 %{summary}, including:
@@ -126,6 +127,8 @@ Provides:  %{name}-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Summary: Extra %{name} runtime libraries 
 Group: System Environment/Libraries 
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+# helps multilib upgrades
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
 %description extras-libs
 %{summary}.
 
@@ -133,8 +136,10 @@ Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
 %endif
@@ -250,7 +255,7 @@ done
 
 
 %post
-/sbin/ldconfig
+%{?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -258,7 +263,7 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig
+%{?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -276,6 +281,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %endif
 
 %post extras
+%{?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -283,6 +289,7 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun extras
+%{?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -334,10 +341,9 @@ rm -rf %{buildroot}
 %files extras-libs
 %defattr(-,root,root,-)
 %endif
-%{_libdir}/libnoatuncontrols.so.*
-%{_libdir}/libnoatun.so.*
-%{_libdir}/libnoatuntags.so.*
-%{_libdir}/libnoatunarts.*
+%{_libdir}/libnoatun*.la
+%{_libdir}/libnoatun*.so.*
+%{_libdir}/libnoatunarts.so
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -419,6 +425,20 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-8
+- -libs: Requires: %%name (multilib upgrades again)
+- scriptlet fixes
+
+* Sat Oct 27 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 6:3.5.8-7
+- fix typo in dependency
+
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-6
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+- -extras-libs: Obsoletes %%name-extras ... likewise
+
+* Thu Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5
+- -extras-libs: (re)include libnoatun*.la
+
 * Tue Oct 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4
 - omit libs from main pkg (-> -libs)
 - -libs conditional (f8+)