From 1268c72571b30d9adf41a79eca4800fb4c8de6bc Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 16 Feb 2015 15:03:47 +0000 Subject: [PATCH] Use pkgconfig for BuildRequires https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires --- gnome-desktop3.spec | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec index 3f90724..7802eab 100644 --- a/gnome-desktop3.spec +++ b/gnome-desktop3.spec @@ -1,8 +1,8 @@ -%define gtk3_version 3.3.6 -%define glib2_version 2.38.0 -%define gtk_doc_version 1.9 -%define gsettings_desktop_schemas_version 3.5.91 -%define po_package gnome-desktop-3.0 +%global gtk3_version 3.3.6 +%global glib2_version 2.38.0 +%global gtk_doc_version 1.14 +%global gsettings_desktop_schemas_version 3.5.91 +%global po_package gnome-desktop-3.0 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop3 @@ -25,17 +25,18 @@ Requires: system-backgrounds-gnome Requires: gnome-themes-standard BuildRequires: gnome-common -BuildRequires: gtk3-devel >= %{gtk3_version} -BuildRequires: gobject-introspection-devel -BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version} -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: libxkbfile-devel -BuildRequires: xkeyboard-config-devel +BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xkeyboard-config) +BuildRequires: pkgconfig(xrandr) BuildRequires: gettext BuildRequires: gtk-doc >= %{gtk_doc_version} BuildRequires: automake autoconf libtool intltool BuildRequires: itstool -BuildRequires: iso-codes-devel # GnomeIdleMonitor API change breaks older gnome-shell versions Conflicts: gnome-shell < 3.7.90 @@ -117,6 +118,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la * Mon Feb 16 2015 David King - 3.15.90-1 - Update to 3.15.90 - Use license macro for COPYING and COPYING.LIB +- Use pkgconfig for BuildRequires * Thu Jan 22 2015 Richard Hughes - 3.15.4-1 - Update to 3.15.4