From f0e882c5bd6bf0f0d0d78d4b19dc8d98329c0a51 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 14 Nov 2012 14:34:17 -0500 Subject: [PATCH] Include gmodule-2.0 to avoid build error --- polkit-0.108-include-gmodule.patch | 26 ++++++++++++++++++++++++++ polkit.spec | 22 +++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 polkit-0.108-include-gmodule.patch diff --git a/polkit-0.108-include-gmodule.patch b/polkit-0.108-include-gmodule.patch new file mode 100644 index 0000000..8b06b2d --- /dev/null +++ b/polkit-0.108-include-gmodule.patch @@ -0,0 +1,26 @@ +From ca1b0cd633fb14d2e152abd7b965b02ea58f66d0 Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Wed, 14 Nov 2012 14:29:16 -0500 +Subject: [PATCH] Include gmodule-2.0 to avoid linker errors + +Signed-off-by: David Zeuthen +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ecf56f1..fefde5d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -122,7 +122,7 @@ if test "x$GCC" = "xyes"; then + changequote([,])dnl + fi + +-PKG_CHECK_MODULES(GLIB, [gio-2.0 >= 2.30.0]) ++PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-2.0 >= 2.30.0]) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +-- +1.8.0 + diff --git a/polkit.spec b/polkit.spec index 7cfc73f..7093dae 100644 --- a/polkit.spec +++ b/polkit.spec @@ -1,7 +1,12 @@ +# Only enable if using patches that touches configure.ac, +# Makefile.am or other build system related files +# +%define enable_autoreconf 1 + Summary: polkit Authorization Framework Name: polkit Version: 0.108 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/polkit Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz @@ -15,6 +20,12 @@ BuildRequires: gobject-introspection-devel BuildRequires: systemd-devel BuildRequires: js-devel +%if 0%{?enable_autoreconf} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +%endif + Requires: dbus Requires(pre): shadow-utils @@ -29,6 +40,8 @@ Conflicts: polkit-gnome < 0.97 Obsoletes: polkit-desktop-policy < 0.103 Provides: polkit-desktop-policy = 0.103 +Patch0: polkit-0.108-include-gmodule.patch + %description polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged @@ -68,8 +81,12 @@ Meta-package for JavaScript engine used by polkit. %prep %setup -q +%patch0 -p1 -b .include-gmodule %build +%if 0%{?enable_autoreconf} +autoreconf +%endif %configure --enable-gtk-doc \ --disable-static \ --enable-introspection \ @@ -146,6 +163,9 @@ exit 0 %{_datadir}/doc/polkit-js-engine-%{version}/README %changelog +* Wed Nov 14 2012 David Zeuthen 0.108-2%{?dist} +- Include gmodule-2.0 to avoid build error + * Wed Nov 14 2012 David Zeuthen 0.108-1%{?dist} - Update to upstream release 0.108 - Drop upstreamed patches