diff --git a/.cvsignore b/.cvsignore index 7ac5eed..9f0958b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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 diff --git a/phonon.spec b/phonon.spec index 25fd7e9..78abef9 100644 --- a/phonon.spec +++ b/phonon.spec @@ -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 = %{version}-%{release} # 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}/hicolor &> /dev/null ||: %changelog +* Sat Oct 03 2009 Rex Dieter - 4.3.1-102 +- Requires: qt4 >= 4.5.2-21 (f12+) + * Tue Sep 29 2009 Rex Dieter - 4.3.1-101 - revert to kde/phonon - inflate to Release: 101 diff --git a/sources b/sources index d71e93e..be29232 100644 --- a/sources +++ b/sources @@ -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