Merge remote-tracking branch 'remotes/origin/el6' into f13

Conflicts:
	.gitignore
	qt-mobility.spec
	sources

qt-mobility.spec

@@ -4,7 +4,7 @@
 
 Name:    qt-mobility
 Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Qt Mobility Framework
 Group:   System Environment/Libraries
 License: LGPLv2 with exceptions
@@ -19,16 +19,20 @@ Provides: qt4-mobility%{?_isa} = %{version}-%{release}
 Patch50: qt-mobility-opensource-src-1.1.0-translationsdir.patch
 
 ## upstream patches
+# double-check if this is still required -- Rex
 Patch101: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: chrpath
+BuildRequires: gstreamer-plugins-bad-free-devel
+BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: libXv-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: pulseaudio-libs-devel
 ## under review, http://bugzilla.redhat.com/626122
 # BuildRequires: libqmf-devel >= 1.0
-BuildRequires: qt4-devel qt4-webkit-devel
+BuildRequires: qt4-devel
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
@@ -115,8 +119,10 @@ cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/
 chrpath --delete %{buildroot}%{_bindir}/* ||:
 chrpath --delete %{buildroot}%{_qt4_libdir}/libQt*.so ||:
 chrpath --delete %{buildroot}%{_qt4_plugindir}/*/*.so ||:
+%if 0%{?_qt4_importdir:1}
 chrpath --delete %{buildroot}%{_qt4_importdir}/*/*.so ||:
 chrpath --delete %{buildroot}%{_qt4_importdir}/*/*/*.so ||:
+%endif
 
 
 %clean
@@ -145,8 +151,10 @@ rm -rf %{buildroot}
 %{_qt4_libdir}/libQtSystemInfo.so.1*
 %{_qt4_libdir}/libQtVersit.so.1*
 %{_qt4_libdir}/libQtVersitOrganizer.so.1*
+%if 0%{?_qt4_importdir:1}
 %{_qt4_importdir}/QtMobility/
 %{_qt4_importdir}/QtMultimediaKit/
+%endif
 %{_qt4_plugindir}/*
 
 %files devel
@@ -217,6 +225,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 23 2011 Rex Dieter <rdieter@fedoraproject.org> 1.1.3-2
+- drop BR: qt4-webkit-devel
+- BR: gstreamer-plugins-bad-free-devel gstreamer-plugins-base-devel libXv-devel
+- tweaks for qt-4.6 (el6)
+
 * Mon May 09 2011 Jaroslav Reznik <jreznik@redhat.com> 1.1.3-1
 - 1.1.3