From 39978d2e9e3d047e02f080ecc3bb061e737f7da6 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 12 Mar 2014 12:17:51 +0100
Subject: [PATCH] Use pkgconfig() notations in [Build]Requires where applicable

---
 evolution.spec | 76 +++++++++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 0073de0..523aac8 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -10,7 +10,6 @@
 %define libgdata_version 0.10.0
 %define libgweather_version 3.5.0
 %define libsoup_version 2.40.3
-%define clutter_gtk_version 0.10
 %define webkit_version 1.8.0
 
 %define evo_base_version 3.12
@@ -61,51 +60,59 @@ Requires: highlight
 
 ### Build Dependencies ###
 
-BuildRequires: atk-devel
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.9
-BuildRequires: cairo-gobject-devel
-BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version}
 BuildRequires: desktop-file-utils
-BuildRequires: evolution-data-server-devel >= %{version}
 BuildRequires: gettext
-BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-common
-BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: gnome-icon-theme-devel >= %{gnome_icon_theme_version}
-BuildRequires: gnome-online-accounts
-BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
-BuildRequires: gtkspell3-devel
 BuildRequires: highlight
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: itstool
-BuildRequires: libcanberra-devel
-BuildRequires: libgdata-devel >= %{libgdata_version}
-BuildRequires: libgweather-devel >= %{libgweather_version}
-BuildRequires: libpst-devel
-BuildRequires: libsoup-devel >= %{libsoup_version}
 BuildRequires: libtool >= 1.5
-BuildRequires: libxml2-devel
-BuildRequires: nspr-devel
-BuildRequires: nss-devel
 BuildRequires: pkgconfig
-BuildRequires: webkitgtk3-devel >= %{webkit_version}
 BuildRequires: yelp-tools
 
+BuildRequires: pkgconfig(atk)
+BuildRequires: pkgconfig(cairo-gobject)
+BuildRequires: pkgconfig(camel-1.2) >= %{version}
+BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gcr-3)
+BuildRequires: pkgconfig(gdk-pixbuf-2.0)
+BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
+BuildRequires: pkgconfig(gnome-icon-theme) >= %{gnome_icon_theme_version}
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
+BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version}
+BuildRequires: pkgconfig(gtkspell3-3.0)
+BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
+BuildRequires: pkgconfig(libcanberra-gtk3)
+BuildRequires: pkgconfig(libebackend-1.2) >= %{version}
+BuildRequires: pkgconfig(libebook-1.2) >= %{version}
+BuildRequires: pkgconfig(libecal-1.2) >= %{version}
+BuildRequires: pkgconfig(libedataserver-1.2) >= %{version}
+BuildRequires: pkgconfig(libgdata) >= %{libgdata_version}
+BuildRequires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version}
+BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(nspr)
+BuildRequires: pkgconfig(nss)
+BuildRequires: pkgconfig(shared-mime-info)
+BuildRequires: pkgconfig(webkitgtk-3.0) >= %{webkit_version}
+
 %if %{ldap_support}
 BuildRequires: openldap-devel >= 2.0.11 
 %endif
 
 %if %{libnotify_support}
-BuildRequires: libnotify-devel
+BuildRequires: pkgconfig(libnotify)
 %endif
 
 %if %{libpst_support}
-BuildRequires: libpst-devel
+BuildRequires: pkgconfig(libpst)
 %endif
 
 %description
@@ -118,14 +125,19 @@ personal information-management tool.
 Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: evolution-data-server-devel >= %{version}
-Requires: gtk3-devel >= %{gtk3_version}
-Requires: gtkhtml3-devel >= %{gtkhtml_version}
-Requires: gtkspell3-devel
-Requires: libgdata-devel >= %{libgdata_version}
-Requires: libgweather-devel >= %{libgweather_version}
-Requires: libsoup-devel >= %{libsoup_version}
-Requires: libxml2-devel
+Requires: pkgconfig(camel-1.2) >= %{version}
+Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
+Requires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version}
+Requires: pkgconfig(gtkspell3-3.0)
+Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
+Requires: pkgconfig(libebackend-1.2) >= %{version}
+Requires: pkgconfig(libebook-1.2) >= %{version}
+Requires: pkgconfig(libecal-1.2) >= %{version}
+Requires: pkgconfig(libedataserver-1.2) >= %{version}
+Requires: pkgconfig(libgdata) >= %{libgdata_version}
+Requires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version}
+Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+Requires: pkgconfig(libxml-2.0)
 Obsoletes: libgal2-devel <= %{last_libgal2_version}
 
 %description devel