[phonon/f14] phonon-4.5.1 pkgconfig-style deps

[Rex Dieter]

commit 0abdf8ef6dec193f6092aee20adc22528eb3af47
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 27 07:50:37 2011 -0500

    phonon-4.5.1
    pkgconfig-style deps

 .gitignore  |   12 ++----------
 phonon.spec |   46 +++++++++++++++++++++-------------------------
 sources     |    2 +-
 3 files changed, 24 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b6f516f..1488abb 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.1.tar.xz
+/phonon-4.5.57-20110914.tar.bz2
diff --git a/phonon.spec b/phonon.spec
index 09893d8..c69e721 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -8,26 +8,18 @@
 
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.5.0
-Release: 2%{?dist}
+Version: 4.5.1
+Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 %if 0%{?snap}
-Source0: phonon-%{version}-%{snap}.tar.bz2
+Source0: phonon-%{version}-%{snap}.tar.xz
 %else
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/phonon-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/phonon-%{version}.tar.xz
 %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,13 +28,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: 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)
 
@@ -51,7 +44,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}
@@ -140,13 +133,6 @@ rm -rf %{buildroot}
 
 %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
@@ -157,6 +143,9 @@ rm -rf %{buildroot}
 %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
@@ -184,6 +173,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 27 2011 Rex Dieter <rdieter at fedoraproject.org> 4.5.1-1
+- phonon-4.5.1
+- pkgconfig-style deps
+
+* Tue May 24 2011 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-3
+- BR: libqzeitgeist-devel
+
 * Fri Apr 08 2011 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-2
 - avoid Conflicts with judicious (Build)Requires: qt4(-devel) instead
 
diff --git a/sources b/sources
index d187ae4..1956b7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32f8d388c18fde2e23dea7bb103f9713  phonon-4.5.0.tar.bz2
+3df071b7f9996afcd67b18958955ecdd  phonon-4.5.1.tar.xz