rpms/phonon/devel .cvsignore, 1.17, 1.18 phonon.spec, 1.64, 1.65 sources, 1.20, 1.21 phonon-4.2.0-ogg-mime-type.patch, 1.1, NONE phonon-4.3.80-fix-gstreamer-pulseaudio-deadlock.patch, 1.1, NONE phonon-4.3.80-fix-xine-pulseaudio-init.patch, 1.1, NONE phonon-4.3.80-old_pa.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27809

Modified Files:
	.cvsignore phonon.spec sources 
Removed Files:
	phonon-4.2.0-ogg-mime-type.patch 
	phonon-4.3.80-fix-gstreamer-pulseaudio-deadlock.patch 
	phonon-4.3.80-fix-xine-pulseaudio-init.patch 
	phonon-4.3.80-old_pa.patch 
Log Message:
* Wed Feb 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-0.2
- preliminary phonon-4.4.0 tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	3 Dec 2009 20:40:07 -0000	1.17
+++ .cvsignore	24 Feb 2010 17:59:23 -0000	1.18
@@ -6,3 +6,4 @@ hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
 phonon-4.3.80.tar.bz2
+phonon-4.4.0.tgz


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- phonon.spec	22 Jan 2010 17:10:22 -0000	1.64
+++ phonon.spec	24 Feb 2010 17:59:24 -0000	1.65
@@ -1,14 +1,15 @@
 
-#define snap 20091203svn
+%define tar_ver 4.4
 
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.3.80
-Release: 6%{?dist}
+Version: 4.4.0
+Release: 0.2%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/phonon/phonon-%{version}.tar.bz2
+Source0: http://home.samfundet.no/~sandsmark/phonon-%{version}.tgz
+#Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-%{version}.tar.bz2
 #Source0: phonon-%{snap}.tar.bz2
 Source1: phonon_snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,17 +29,9 @@ Patch0:  phonon-4.3.80-pulseaudio-device
 Patch1:  phonon-4.3.50-xine_pulseaudio.patch
 
 ## Mandriva/upstreamable patches
-Patch50: phonon-4.2.0-ogg-mime-type.patch
 Patch51: phonon-4.3.50-fix-decodebin-usage.patch
 Patch52: phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch
 Patch53: phonon-4.3.50-phonon-allow-stop-empty-source.patch
-Patch54: phonon-4.3.80-fix-gstreamer-pulseaudio-deadlock.patch
-# http://bugs.kde.org/223662
-Patch55: phonon-4.3.80-fix-xine-pulseaudio-init.patch
-
-# patch adapted from http://permalink.gmane.org/gmane.comp.kde.users.multimedia/5700
-# splits out device_manager bits used only on pa >= 0.9.21
-Patch60: phonon-4.3.80-old_pa.patch
 
 ## Upstream patches
 
@@ -69,7 +62,7 @@ Requires: qt4%{?_isa} >= %{_qt4_version}
 %package devel
 Summary: Developer files for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt4-devel
 Requires: pkgconfig
 %description devel
@@ -97,27 +90,24 @@ Provides:  %{name}-backend-gst = %{versi
 
 
 %prep
-%setup -q -n phonon%{!?snap:-%{version}}
+%setup -q -n phonon%{!?snap:-%{?tar_ver}%{!?tar_ver:%{version}}}
 
 %if 0%{?pa_keep_old_hacks}
-%patch0 -p1 -b .pulseaudio-device-priorities
-%patch1 -p1 -b .xine_pulseaudio
+# FIXME/adapt to 4.4, or drop 
+#patch0 -p1 -b .pulseaudio-device-priorities
+#patch1 -p1 -b .xine_pulseaudio
 %endif
 
-%patch50 -p0 -b .ogg-mime-type
 %patch51 -p0 -b .fix-decodebin-usage
 %patch52 -p1 -b .gstreamer-fix-seekable-query-failed
 %patch53 -p1 -b .phonon-allow-stop-empty-source
-%patch54 -p1 -b .fix-gstreamer-pulseaudio-deadlock
-%patch55 -p1 -b .fix-xine-pulseaudio-init
-
-%patch60 -p1 -b .old_pa
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} \
+  %{?_cmake_skip_rpath} \
   -DUSE_INSTALL_PLUGIN=TRUE \
   ..
 popd
@@ -216,6 +206,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Feb 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-0.2
+- preliminary phonon-4.4.0 tarball
+
 * Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-6
 - sync w/mdv patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	3 Dec 2009 20:40:07 -0000	1.20
+++ sources	24 Feb 2010 17:59:24 -0000	1.21
@@ -5,4 +5,4 @@
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-6b0c5554291615433c14c3c38f741690  phonon-4.3.80.tar.bz2
+80544b876cf0e0af05f2303b3f534351  phonon-4.4.0.tgz


--- phonon-4.2.0-ogg-mime-type.patch DELETED ---


--- phonon-4.3.80-fix-gstreamer-pulseaudio-deadlock.patch DELETED ---


--- phonon-4.3.80-fix-xine-pulseaudio-init.patch DELETED ---


--- phonon-4.3.80-old_pa.patch DELETED ---