rpms/phonon/F-10 .cvsignore, 1.8, 1.9 phonon.spec, 1.21, 1.22 sources, 1.8, 1.9

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2362/F-10

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 May 2009 16:25:31 -0000	1.8
+++ .cvsignore	7 Oct 2009 14:24:40 -0000	1.9
@@ -1,3 +1,8 @@
 gstreamer-logo.svg
-phonon-4.3.0.tar.bz2
 phonon-4.3.1.tar.bz2
+hi128-phonon-gstreamer.png
+hi16-phonon-gstreamer.png
+hi22-phonon-gstreamer.png
+hi32-phonon-gstreamer.png
+hi48-phonon-gstreamer.png
+hi64-phonon-gstreamer.png


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/phonon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- phonon.spec	7 Oct 2009 13:11:53 -0000	1.21
+++ phonon.spec	7 Oct 2009 14:24:40 -0000	1.22
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 101%{?dist}
+Release: 102%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -48,14 +48,16 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
-## can switch to Requires instead of Conflicts once bootstrapping is done
-#Requires: qt4%{?_isa} >= %{_qt4_version}
-Conflicts: qt4 < 4.5.2-21
+%if 0%{?fedora} > 11
+Requires: qt4%{?_isa} >= 4.5.2-21 
+%else
+Requires: qt4%{?_isa} >= %{_qt4_version}
+%endif
 
 %description
 %{summary}.
@@ -101,7 +103,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,6 +204,9 @@ 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 (f12+)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
 - revert to kde/phonon
 - inflate to Release: 101


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Mar 2009 16:54:23 -0000	1.8
+++ sources	7 Oct 2009 14:24:40 -0000	1.9
@@ -1,2 +1,8 @@
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
 767cb68052c108e95f293f30acdef3fb  phonon-4.3.1.tar.bz2
+60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
+7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
+0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
+12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
+86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
+153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png