diff --git a/phonon.spec b/phonon.spec index 9084ab0..4ab1c82 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