rpms/phonon/F-12 phonon.spec,1.46,1.47

[Lukas Tinkl]

Author: ltinkl

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

Modified Files:
	phonon.spec 
Log Message:
sync with devel/



Index: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- phonon.spec	4 Oct 2009 02:38:14 -0000	1.46
+++ phonon.spec	7 Oct 2009 13:11:53 -0000	1.47
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 102%{?dist}
+Release: 101%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -29,7 +29,7 @@ Patch2:  qt-x11-opensource-src-4.5.2-gst
 
 ## define to build phonon-backend-xine only
 #define xine_only 1
-Patch10: phonon-4.3.1-xineonly.patch
+#Patch10: phonon-4.3.1-xineonly.patch
 
 ## Upstream patches
 Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
@@ -48,14 +48,14 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.5.2-21
+BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
 ## can switch to Requires instead of Conflicts once bootstrapping is done
-#Conflicts: qt4 < 4.5.2-21
-Requires: qt4%{?_isa} >= 4.5.2-21 
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Conflicts: qt4 < 4.5.2-21
 
 %description
 %{summary}.
@@ -101,7 +101,7 @@ Provides:  %{name}-backend-gst = %{versi
 
 # not working?  use -C .../xine hack below instead for now  -- Rex
 %if 0%{?xine_only}
-%patch10 -p1 -b .xineonly
+#%patch10 -p1 -b .xineonly
 %endif
 
 
@@ -202,9 +202,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
-* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
-- Requires: qt4 >= 4.5.2-21
-
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
 - revert to kde/phonon
 - inflate to Release: 101