rpms/phonon/devel .cvsignore, 1.14, 1.15 phonon.spec, 1.49, 1.50 sources, 1.16, 1.17

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-3.20091124
- phonon-4.3.50 (20091124 snapshot)
- enable pulseaudio integration (F-12+)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Nov 2009 19:18:57 -0000	1.14
+++ .cvsignore	24 Nov 2009 16:38:29 -0000	1.15
@@ -7,3 +7,4 @@ hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
 phonon-20091118svn.tar.bz2
+phonon-20091124svn.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- phonon.spec	18 Nov 2009 19:18:57 -0000	1.49
+++ phonon.spec	24 Nov 2009 16:38:29 -0000	1.50
@@ -1,10 +1,10 @@
 
-%define snap 20091118svn
+%define snap 20091124svn
 
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.50
-Release: 2.%{snap}%{?dist}
+Release: 3.%{snap}%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -39,6 +39,11 @@ BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
+%if 0%{?fedora} > 11
+BuildRequires: pulseaudio-libs-devel >= 0.9.21
+%else
+%define pa_keep_old_hacks 1
+%endif
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
@@ -79,7 +84,9 @@ Provides:  %{name}-backend-gst = %{versi
 %prep
 %setup -q -n phonon%{!?snap:-%{version}}
 
+%if 0%{?pa_keep_old_hacks}
 %patch1 -p1 -b .xine_pulseaudio
+%endif
 
 
 %build
@@ -179,7 +186,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
-* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-1.20091118
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-3.20091124
+- phonon-4.3.50 (20091124 snapshot)
+- enable pulseaudio integration (F-12+)
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-2.20091118
 - phonon-4.3.50 (20091118 snapshot)
 
 * Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-1.20091019


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	18 Nov 2009 19:18:57 -0000	1.16
+++ sources	24 Nov 2009 16:38:29 -0000	1.17
@@ -5,4 +5,4 @@
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-2710eecb01d27ede4ba5348858b6c0e4  phonon-20091118svn.tar.bz2
+0b522b42d9be2b9297ab972b861fdbb8  phonon-20091124svn.tar.bz2