avoid Conflicts with judicious (Build)Requires: qt4(-devel) instead

phonon.spec

@@ -9,7 +9,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -23,9 +23,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # (may?) need to be careful here, bootstrapping this with qt
 # added Obsoletes into qt-4.7.2-6 instead of here -- Rex
 #Obsoletes: qt-designer-plugin-phonon < 1:4.7.2-100
-Conflicts: qt-designer-plugin-phonon < 1:4.7.2-6
+#Conflicts: qt-designer-plugin-phonon < 1:4.7.2-6
 Provides:  qt-designer-plugin-phonon = 1:4.7.2-100
 Provides:  qt-designer-plugin-phonon%{?_isa} = 1:4.7.2-100
+Requires: qt4%{?_isa} >= 4.7.2-6 
 
 Patch1: phonon-4.4.4-no_rpath.patch
 
@@ -40,7 +41,7 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.6.0
+BuildRequires: qt4-devel >= 4.7.2
 BuildRequires: pulseaudio-libs-devel >= 0.9.15
 
 %global pulseaudio_version %(pkg-config --modversion libpulse 2>/dev/null || echo 0.9.15)
@@ -50,7 +51,7 @@ Requires: kde-filesystem
 Requires: phonon-backend%{?_isa} => 4.4
 #Provides: phonon-backend%{?_isa} = 4.4
 Requires: pulseaudio-libs%{?_isa} >= %{pulseaudio_version}
-Requires: qt4%{?_isa} >= %{_qt4_version}
+#Requires: qt4%{?_isa} >= %{_qt4_version}
 
 %if ! 0%{?experimental}
 #Obsoletes: phonon-experimental < %{version}-%{release}
@@ -183,6 +184,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Apr 08 2011 Rex Dieter <rdieter@fedoraproject.org> 4.5.0-2
+- avoid Conflicts with judicious (Build)Requires: qt4(-devel) instead
+
 * Fri Mar 25 2011 Rex Dieter <rdieter@fedoraproject.org> 4.5.0-1
 - phonon-4.5.0
 - qt-designer-plugin-phonon moved here (from qt)