Use pkgconfig for BuildRequires

https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires
This commit is contained in:
David King 2015-01-29 21:46:45 +00:00
parent 23ecc8eb3e
commit bb55ab0d21
2 changed files with 49 additions and 19 deletions

View File

@ -0,0 +1,27 @@
From dd4fb5f5b1f1c447caf807c7c4bf22f0b5ef1f7e Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Thu, 29 Jan 2015 22:01:48 +0000
Subject: [PATCH] manager: Drop unnecessary dbus-glib include
Fix the build when dbus-glib is not available.
https://bugzilla.gnome.org/show_bug.cgi?id=743718
---
gnome-session/gsm-manager.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnome-session/gsm-manager.h b/gnome-session/gsm-manager.h
index 39595a1..821bea6 100644
--- a/gnome-session/gsm-manager.h
+++ b/gnome-session/gsm-manager.h
@@ -22,7 +22,6 @@
#define __GSM_MANAGER_H
#include <glib-object.h>
-#include <dbus/dbus-glib.h>
#include "gsm-store.h"
#include "gsm-manager-logout-mode.h"
--
2.2.2

View File

@ -20,6 +20,8 @@ Source0: http://download.gnome.org/sources/gnome-session/3.15/%{name}-%{version}
Patch1: gnome-session-3.3.92-nv30.patch Patch1: gnome-session-3.3.92-nv30.patch
Patch2: 0001-main-Set-XDG_MENU_PREFIX.patch Patch2: 0001-main-Set-XDG_MENU_PREFIX.patch
Patch3: gnome-session-3.6.2-swrast.patch Patch3: gnome-session-3.6.2-swrast.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=743718
Patch4: gnome-session-3.15.4-no-dbus-glib.patch
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
@ -33,20 +35,23 @@ Requires: gsettings-desktop-schemas >= 0.1.7
# pull in dbus-x11, see bug 209924 # pull in dbus-x11, see bug 209924
Requires: dbus-x11 Requires: dbus-x11
BuildRequires: gtk3-devel >= 2.99.0 BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: dbus-glib-devel BuildRequires: pkgconfig(gl)
BuildRequires: gnome-desktop3-devel BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: libnotify-devel >= 0.7.0 BuildRequires: pkgconfig(gtk+-3.0) >= 2.99.0
BuildRequires: GConf2-devel BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pango-devel BuildRequires: pkgconfig(libsystemd-journal)
BuildRequires: gnome-settings-daemon-devel BuildRequires: pkgconfig(libsystemd-login)
BuildRequires: desktop-file-utils BuildRequires: pkgconfig(ice)
BuildRequires: libXau-devel BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: libXrandr-devel BuildRequires: pkgconfig(sm)
BuildRequires: xorg-x11-xtrans-devel BuildRequires: pkgconfig(x11)
BuildRequires: mesa-libGL-devel BuildRequires: pkgconfig(xau)
BuildRequires: librsvg2-devel BuildRequires: pkgconfig(xcomposite)
BuildRequires: json-glib-devel BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xtrans)
BuildRequires: pkgconfig(xtst)
# this is so the configure checks find /usr/bin/halt etc. # this is so the configure checks find /usr/bin/halt etc.
BuildRequires: usermode BuildRequires: usermode
@ -54,13 +59,9 @@ BuildRequires: usermode
BuildRequires: intltool, autoconf, automake BuildRequires: intltool, autoconf, automake
BuildRequires: libtool BuildRequires: libtool
BuildRequires: gettext BuildRequires: gettext
BuildRequires: libX11-devel libXt-devel
BuildRequires: libXtst-devel
BuildRequires: xmlto BuildRequires: xmlto
BuildRequires: upower-devel
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: systemd-devel BuildRequires: /usr/bin/xsltproc
BuildRequires: polkit-devel
# an artificial requires to make sure we get dconf, for now # an artificial requires to make sure we get dconf, for now
Requires: dconf Requires: dconf
@ -91,6 +92,7 @@ Desktop file to add GNOME on wayland to display manager session menu.
%patch1 -p1 -b .nv30 %patch1 -p1 -b .nv30
%patch2 -p1 -b .set-xdg-menu-prefix %patch2 -p1 -b .set-xdg-menu-prefix
%patch3 -p1 -b .swrast %patch3 -p1 -b .swrast
%patch4 -p1 -b .no-dbus-glib
echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
@ -150,6 +152,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
* Thu Jan 29 2015 David King <amigadave@amigadave.com> - 3.15.4-1 * Thu Jan 29 2015 David King <amigadave@amigadave.com> - 3.15.4-1
- Update to 3.15.4 - Update to 3.15.4
- Use license macro for COPYING - Use license macro for COPYING
- Use pkgconfig for BuildRequires
* Mon Jan 05 2015 Ray Strode <rstrode@redhat.com> 3.15.3-2 * Mon Jan 05 2015 Ray Strode <rstrode@redhat.com> 3.15.3-2
- Fix crasher - Fix crasher