rpms/phonon/F-11 phonon.spec, 1.35, 1.36 phonon-4.3.1-xineonly.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/phonon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30310

Modified Files:
	phonon.spec 
Removed Files:
	phonon-4.3.1-xineonly.patch 
Log Message:
revert the change, it's only for devel



Index: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-11/phonon.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- phonon.spec	5 Jun 2009 23:23:12 -0000	1.35
+++ phonon.spec	5 Jun 2009 23:37:39 -0000	1.36
@@ -2,37 +2,84 @@ Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
 Release: 7%{?dist}
-Group:   Applications/Multimedia
+Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
+#Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2
 Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
+Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: phonon-4.3.1-xineonly.patch
+# Make PulseAudio the default again when listed by the backend.
+# Note that this currently only works for the Xine backend. Device selection in
+# the GStreamer backend is weird: there is a setting for "sink" which cannot be
+# set through systemsettings, and listed devices are only those supported by the
+# "sink". So it never lists "PulseAudio" as a supported device, you have to pick
+# it as a "sink", and then the device setting is ignored entirely.
+Patch0:  phonon-4.2.96-pulseaudio.patch
+Patch1:  phonon-4.2.96-xine-pulseaudio.patch
+
+## Upstream patches
+Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
+Patch101: phonon-4.3.2-gstreamer-volumefader.patch
+# fix for non-ascii filenames in xine backend
+Patch102: phonon-4.3.2-kdebug#172242.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: GraphicsMagick
 BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.5.1
+BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
+Requires: phonon-backend%{?_isa} >= %{version}
+## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
+#Requires(hint): phonon-backend-xine%{?_isa} >= %{version}
+
 %description
 %{summary}.
 
+%package backend-gstreamer
+Summary: Gstreamer phonon backend
+Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Provides: phonon-backend%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-backend-gst < 4.2.0-4
+Provides:  %{name}-backend-gst = %{version}-%{release}
+%description backend-gstreamer
+%{summary}.
+
 %package backend-xine
 Summary: xine phonon backend
 Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 Provides: phonon-backend%{?_isa} = %{version}-%{release}
 %description backend-xine
 %{summary}.
 
+%package devel
+Summary: Developer files for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel
+Requires: pkgconfig
+%description devel
+%{summary}.
+
+
 %prep
 %setup -q -n phonon-%{version}%{?alphatag}
-%patch0 -p1 -b .xineonly
+%patch0 -p1 -b .pulseaudio
+%patch1 -p1 -b .xine-pulseaudio
+%patch100 -p0 -b .gstreamer-utf8-url
+%patch101 -p0 -b .gstreamer-volumefader
+%patch102 -p1 -b .xine_nonascii
 
 
 %build
@@ -50,18 +97,44 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # move the oxygen-only phonon-xine icons to hicolor
-if [ ! -d %{buildroot}%{_datadir}/icons/hicolor ] ; then
-  mv %{buildroot}%{_datadir}/icons/oxygen \
-     %{buildroot}%{_datadir}/icons/hicolor
-fi
+test -d %{buildroot}%{_datadir}/icons/hicolor && exit 0
+mv %{buildroot}%{_datadir}/icons/oxygen \
+   %{buildroot}%{_datadir}/icons/hicolor
+
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
+for i in 16 22 32 48 64 128; do
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  gm convert -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
+  touch --reference %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
+done
+
 
 %clean
 rm -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post backend-gstreamer
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
 %post backend-xine
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
+%posttrans backend-gstreamer
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans backend-xine
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%postun backend-gstreamer
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
 %postun backend-xine
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -69,17 +142,39 @@ if [ $1 -eq 0 ] ; then
 fi
 
 
-%files backend-xine
+%files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
+%{_libdir}/libphonon*.so.4*
+%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+# kde4-specific dirs
+%dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
+%dir %{_kde4_datadir}/kde4/services/phononbackends/
+
+%files backend-gstreamer
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
+%{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
+
+%files backend-xine
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 %{_datadir}/icons/hicolor/*/apps/phonon-xine.*
 
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/KDE
+%{_includedir}/KDE/Phonon/
+%{_includedir}/phonon/
+%{_libdir}/pkgconfig/phonon.pc
+%{_libdir}/libphonon*.so
+
+
 %changelog
-* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.3.1-7
-- only xine-backend
+* Sat Jun 06 2009 Than Ngo <than at redhat.com> - 4.3.1-7
+- revert the change, it's only for devel
 
 * Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-6
 - phonon-backend-gstreamer multilib conflict (#501816)


--- phonon-4.3.1-xineonly.patch DELETED ---