From 803713b5fee453117d8ccf312cb81215fb81e738626d047398fa693d7709fc84 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 11 Apr 2013 12:12:08 +0000 Subject: [PATCH] Accepting request 163620 from home:sumski:branches:Base:System Fix for automake 1.13 OBS-URL: https://build.opensuse.org/request/show/163620 OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=90 --- automake-113.patch | 25 +++++++++++++++++++++++++ polkit-suid_flags.patch | 6 +++--- polkit.changes | 5 +++++ polkit.spec | 3 +++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 automake-113.patch diff --git a/automake-113.patch b/automake-113.patch new file mode 100644 index 0000000..6a6d792 --- /dev/null +++ b/automake-113.patch @@ -0,0 +1,25 @@ +From 7caa88f1eb8d01ab935f1d1e34a0db20f554448b Mon Sep 17 00:00:00 2001 +From: Nuno Araujo +Date: Tue, 15 Jan 2013 16:47:22 +0000 +Subject: Fix the build with automake 1.13 + +In Automake 1.13, the long-deprecated macro AM_CONFIG_HEADER (deprecated +since 2002) has been removed in favour of AC_CONFIG_HEADERS. + +Signed-off-by: David Zeuthen +--- +diff --git a/configure.ac b/configure.ac +index 40f0cd7..7d2dfcd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. + AC_PREREQ(2.59c) + AC_INIT(polkit, 0.110 http://lists.freedesktop.org/mailman/listinfo/polkit-devel) + AM_INIT_AUTOMAKE(polkit, 0.110) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_MAINTAINER_MODE + + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +cgit v0.9.0.2-2-gbebe diff --git a/polkit-suid_flags.patch b/polkit-suid_flags.patch index d9b0bc5..23464d7 100644 --- a/polkit-suid_flags.patch +++ b/polkit-suid_flags.patch @@ -10,7 +10,7 @@ diff --git a/configure.ac b/configure.ac index f4a0c41..42da974 100644 --- a/configure.ac +++ b/configure.ac -@@ -429,6 +429,11 @@ AC_SUBST([GETTEXT_PACKAGE]) +@@ -459,6 +459,11 @@ AC_SUBST([GETTEXT_PACKAGE]) AM_GLIB_GNU_GETTEXT AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) @@ -26,7 +26,7 @@ diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am index e8c9fb1..f0f8419 100644 --- a/src/polkitagent/Makefile.am +++ b/src/polkitagent/Makefile.am -@@ -92,6 +92,7 @@ endif +@@ -94,6 +94,7 @@ endif polkit_agent_helper_1_CFLAGS = \ -D_POLKIT_COMPILATION \ @@ -34,7 +34,7 @@ index e8c9fb1..f0f8419 100644 $(GLIB_CFLAGS) \ $(NULL) -@@ -101,6 +102,11 @@ polkit_agent_helper_1_LDADD = \ +@@ -103,6 +104,11 @@ polkit_agent_helper_1_LDADD = \ $(top_builddir)/src/polkit/libpolkit-gobject-1.la \ $(NULL) diff --git a/polkit.changes b/polkit.changes index 53f40d1..2582ff0 100644 --- a/polkit.changes +++ b/polkit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 11 01:17:21 UTC 2013 - hrvoje.senjan@gmail.com + +- Add automake-113.patch, fixes build with automake-1.13 + ------------------------------------------------------------------- Mon Feb 18 19:47:33 UTC 2013 - gber@opensuse.org diff --git a/polkit.spec b/polkit.spec index 9dc8afa..2377874 100644 --- a/polkit.spec +++ b/polkit.spec @@ -37,6 +37,8 @@ Patch0: polkit-no-wheel-group.patch Patch1: polkit-suid_flags.patch # PATCH-FIX-UPSTREAM polkit-no-systemd.patch bnc#782395 fdo#55377 vuntz@opensuse.org -- Do not reference non-existing polkit.service file for systemd (only applied if not built with systemd support) Patch2: polkit-no-systemd.patch +# PATCH-FIX-UPSTREAM automake-113.patch -- Use AC_CONFIG_HEADERS macro instead of deprecated AM_CONFIG_HEADER, fixes build with Automake 1.13 +Patch3: automake-113.patch # needed for patch1 BuildRequires: autoconf # needed for patch1 @@ -127,6 +129,7 @@ This package provides the GObject Introspection bindings for PolicyKit. %if !(0%{?with_systemd}) %patch2 -p1 %endif +%patch3 -p1 %build export V=1