From 8cefd8fb835db02a7b7c221a70a1ddfeb782e64a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 23 Sep 2011 09:26:51 -0500
Subject: [PATCH] 4.5.57 20110914 snapshot pkgconfig-style deps

---
 .gitignore  | 10 +---------
 phonon.spec | 49 +++++++++++++++++++++++--------------------------
 sources     |  2 +-
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index b6f516f..cf466b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,2 @@
-/gstreamer-logo.svg
-/hi128-phonon-gstreamer.png
-/hi16-phonon-gstreamer.png
-/hi22-phonon-gstreamer.png
-/hi32-phonon-gstreamer.png
-/hi48-phonon-gstreamer.png
-/hi64-phonon-gstreamer.png
-/phonon-4.4.3.tar.bz2
-/phonon-4.4.4.tar.bz2
 /phonon-4.5.0.tar.bz2
+/phonon-4.5.57-20110914.tar.bz2
diff --git a/phonon.spec b/phonon.spec
index ea3ee99..34d6e25 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -6,10 +6,12 @@
 ## split -experimental subpkgs
 #define experimental 1
 
+%define snap 20110914
+
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.5.0
-Release: 3%{?dist}
+Version: 4.5.57
+Release: 1.%{snap}%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -20,14 +22,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/phonon-%{version
 %endif
 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
-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
 
 ## Ubuntu/upstreamable patches
@@ -36,14 +30,14 @@ Patch1: phonon-4.4.4-no_rpath.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
-BuildRequires: glib2-devel
 BuildRequires: kde-filesystem
-BuildRequires: libqzeitgeist-devel
-BuildRequires: libxcb-devel
-BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.7.2
-BuildRequires: pulseaudio-libs-devel >= 0.9.15
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libpulse-mainloop-glib) > 0.9.15
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(QtGui) >= 4.7.2
+BuildRequires: pkgconfig(QtZeitgeist)
+BuildRequires: pkgconfig(xcb)
 
 %global pulseaudio_version %(pkg-config --modversion libpulse 2>/dev/null || echo 0.9.15)
 
@@ -52,7 +46,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}
@@ -105,6 +99,7 @@ mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} \
   %{?phonon_build_tests} \
+  -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \
   ..
 popd
 
@@ -138,26 +133,22 @@ rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-%if 0%{?experimental}
-%post experimental -p /sbin/ldconfig
-
-%postun experimental -p /sbin/ldconfig
-%endif
-
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/libphonon.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %{_qt4_plugindir}/designer/libphononwidgets.so
+%dir %{_datadir}/phonon/
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
 
 %if 0%{?experimental}
+%post experimental -p /sbin/ldconfig
+%postun experimental -p /sbin/ldconfig
+
 %files experimental
 %defattr(-,root,root,-)
 %endif
@@ -165,7 +156,9 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_datadir}/phonon-buildsystem/
+%{_datadir}/phonon/buildsystem/
+%dir %{_libdir}/cmake/
+%{_libdir}/cmake/phonon/
 %dir %{_includedir}/KDE
 %{_includedir}/KDE/Phonon/
 %{_includedir}/phonon/
@@ -185,6 +178,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 23 2011 Rex Dieter <rdieter@fedoraproject.org> 4.5.57-1.20110914
+- 4.5.57 20110914 snapshot
+- pkgconfig-style deps
+
 * Tue May 24 2011 Rex Dieter <rdieter@fedoraproject.org> 4.5.0-3
 - BR: libqzeitgeist-devel
 
diff --git a/sources b/sources
index d187ae4..7a52343 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32f8d388c18fde2e23dea7bb103f9713  phonon-4.5.0.tar.bz2
+044dee32142a2b55b0bbe7749b833522  phonon-4.5.57-20110914.tar.bz2