From 9c5abd9f96213278ba967a5cce71fe9eead91c28 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mar 12 2014 11:15:56 +0000 Subject: Use pkgconfig() notations in [Build]Requires where applicable --- diff --git a/evolution-data-server.spec b/evolution-data-server.spec index a8646b8..99408d6 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -8,7 +8,7 @@ %{!?with_docs: %define with_docs 1} %define glib2_version 2.36.0 -%define gtk3_version 3.2.0 +%define gtk3_version 3.4.0 %define gcr_version 3.4 %define gtk_doc_version 1.9 %define goa_version 3.8 @@ -54,33 +54,38 @@ Requires: dconf ### Build Dependencies ### -BuildRequires: libdb-devel -BuildRequires: gcr-devel >= %{gcr_version} BuildRequires: gettext -BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common -BuildRequires: gnome-online-accounts-devel >= %{goa_version} -BuildRequires: gnutls-devel BuildRequires: gperf BuildRequires: gtk-doc >= %{gtk_doc_version} -BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: intltool >= %{intltool_version} -BuildRequires: libgdata-devel >= %{libgdata_version} -BuildRequires: libgweather-devel >= %{libgweather_version} -BuildRequires: libical-devel >= %{libical_version} -BuildRequires: libsecret-devel >= %{libsecret_version} -BuildRequires: libsoup-devel >= %{libsoup_version} +BuildRequires: libdb-devel BuildRequires: libtool -BuildRequires: nspr-devel -BuildRequires: nss-devel >= %{nss_version} -BuildRequires: sqlite-devel >= %{sqlite_version} BuildRequires: vala BuildRequires: vala-tools +BuildRequires: pkgconfig(gcr-3) >= %{gcr_version} +BuildRequires: pkgconfig(gcr-base-3) >= %{gcr_version} +BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(goa-1.0) >= %{goa_version} +BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} +BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version} +BuildRequires: pkgconfig(libical) >= %{libical_version} +BuildRequires: pkgconfig(libsecret-unstable) >= %{libsecret_version} +BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(nspr) +BuildRequires: pkgconfig(nss) >= %{nss_version} +BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version} + %if %{ldap_support} %if %{static_ldap} BuildRequires: openldap-devel%{?_isa} -BuildRequires: openssl-devel +BuildRequires: pkgconfig(openssl) %else BuildRequires: openldap-devel >= 2.0.11 %endif @@ -101,13 +106,14 @@ by other packages. Summary: Development files for building against %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gnome-online-accounts-devel -Requires: libgdata-devel -Requires: libgweather-devel -Requires: libical-devel -Requires: libsecret-devel -Requires: libsoup-devel -Requires: sqlite-devel + +Requires: pkgconfig(goa-1.0) >= %{goa_version} +Requires: pkgconfig(libgdata) >= %{libgdata_version} +Requires: pkgconfig(gweather-3.0) >= %{libgweather_version} +Requires: pkgconfig(libical) >= %{libical_version} +Requires: pkgconfig(libsecret-unstable) >= %{libsecret_version} +Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version} +Requires: pkgconfig(sqlite3) >= %{sqlite_version} %description devel Development files needed for building things which link against %{name}.