From 56b3144529687a11961d7b412d93a8ef6b51de4b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Thu, 22 Sep 2011 11:35:19 -0500
Subject: [PATCH] pkgconfig-style deps

---
 kdelibs.spec | 64 ++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/kdelibs.spec b/kdelibs.spec
index a5b2ba2..b89f770 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -20,7 +20,7 @@
 
 Summary: KDE Libraries
 Version: 4.7.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -144,51 +144,51 @@ Conflicts: kile < 2.1-0.9
 Conflicts: rkward < 0.5.4
 
 BuildRequires: qt4-devel >= %{qt4_ver}
-BuildRequires: qt4-webkit-devel
+BuildRequires: pkgconfig(QtWebKit)
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: xdg-utils
 Requires: redhat-menus
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: alsa-lib-devel
-BuildRequires: attica-devel >= %{attica_ver} 
 BuildRequires: automoc4 >= 0.9.88
-BuildRequires: avahi-devel
 BuildRequires: bison flex
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.6.4
 BuildRequires: cups-devel cups
-BuildRequires: enchant-devel
-BuildRequires: gamin-devel
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
 BuildRequires: grantlee-devel
 BuildRequires: herqq-devel
-BuildRequires: jasper-devel
 BuildRequires: krb5-devel
 BuildRequires: libacl-devel libattr-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
-BuildRequires: libxslt-devel libxml2-devel
-BuildRequires: libudev-devel
 BuildRequires: libutempter-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: openssl-devel
-BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= %{phonon_ver} 
-BuildRequires: polkit-qt-devel >= 0.98.1
-BuildRequires: qca2-devel
-BuildRequires: shared-desktop-ontologies-devel >= %{shared_desktop_ontologies_ver} 
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(avahi-core)
+BuildRequires: pkgconfig(dbusmenu-qt)
+BuildRequires: pkgconfig(enchant)
+BuildRequires: pkgconfig(gamin)
+BuildRequires: pkgconfig(jasper)
+BuildRequires: pkgconfig(libattica) >= %{attica_ver}
+BuildRequires: pkgconfig(liblzma)
+BuildRequires: pkgconfig(libpcre)
+BuildRequires: pkgconfig(libstreams) >= %{strigi_ver}
+BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(OpenEXR)
+BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(phonon) >= %{phonon_ver} 
+BuildRequires: pkgconfig(polkit-qt-1)
+BuildRequires: pkgconfig(qca2)
+BuildRequires: pkgconfig(shared-desktop-ontologies) >= %{shared_desktop_ontologies_ver} 
+BuildRequires: pkgconfig(soprano) >= %{soprano_ver}
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= %{soprano_ver} 
-BuildRequires: strigi-devel >= %{strigi_ver} 
-BuildRequires: xz-devel
 BuildRequires: zlib-devel
-BuildRequires: dbusmenu-qt-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
-%define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
+#define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
+%define x_deps pkgconfig(sm) pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xkbfile) pkgconfig(xpm) pkgconfig(xscrnsaver) pkgconfig(xtst) pkgconfig(xv) pkgconfig(xxf86misc)
 %{?x_deps:BuildRequires: %{x_deps}}
 
 Requires: udisks upower
@@ -237,19 +237,20 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
-Requires: attica-devel >= %{attica_ver} 
+Requires: pkgconfig(attica) >= %{attica_ver} 
 Requires: automoc4 >= 0.9.88
 Requires: cmake >= 2.6.4
-Requires: openssl-devel
-Requires: phonon-devel
+Requires: pkgconfig(openssl)
+Requires: pkgconfig(phonon)
 Provides: nepomuk-devel = %{version}-%{release}
 # considered part of nepomuk-devel
-Requires: shared-desktop-ontologies-devel soprano-devel
+Requires: pkgconfig(shared-desktop-ontologies) pkgconfig(soprano)
 Requires: qt4-devel
-Requires: qt4-webkit-devel
+Requires: pkgconfig(QtWebKit) 
 # do we really still need all these below? -- Rex
-Requires: strigi-devel
-Requires: bzip2-devel gamin-devel libacl-devel
+Requires: pkgconfig(libstreams)
+Requires: pkgconfig(gamin)
+Requires: bzip2-devel libacl-devel
 %{?x_deps:Requires: %{x_deps}}
 
 %description devel
@@ -561,6 +562,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 22 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.1-3
+- pkgconfig-style deps
+
 * Fri Sep 02 2011 Than Ngo <than@redhat.com> - 4.7.1-1
 - 4.7.1