From bbf2491ad511f3d02afe44c75ee62c22093c320cbf52c17afda24d0a1e6a93c6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 5 Nov 2014 21:06:18 +0000 Subject: [PATCH] Accepting request 259793 from GNOME:Next - Add autoconf-archive Requires: the files ax_check_enable_debug.m4 and ax_code_coverage.m4 are now shipped by ac-archive and from a GNOME perspective, those two files are mandatory to be present for a bootstrap. - Remove ax_check_enable_debug.m4 and ax_code_coverage.m4 from gnome-common installation. OBS-URL: https://build.opensuse.org/request/show/259793 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-common?expand=0&rev=43 --- gnome-common.changes | 10 ++++++++++ gnome-common.spec | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gnome-common.changes b/gnome-common.changes index e832485..4776008 100644 --- a/gnome-common.changes +++ b/gnome-common.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Nov 5 12:53:08 UTC 2014 - dimstar@opensuse.org + +- Add autoconf-archive Requires: the files ax_check_enable_debug.m4 + and ax_code_coverage.m4 are now shipped by ac-archive and from + a GNOME perspective, those two files are mandatory to be present + for a bootstrap. +- Remove ax_check_enable_debug.m4 and ax_code_coverage.m4 from + gnome-common installation. + ------------------------------------------------------------------- Mon Sep 22 14:24:22 UTC 2014 - zaitor@opensuse.org diff --git a/gnome-common.spec b/gnome-common.spec index a128850..2022b74 100644 --- a/gnome-common.spec +++ b/gnome-common.spec @@ -26,6 +26,8 @@ Url: http://www.gnome.org/ Source: http://download.gnome.org/sources/gnome-common/3.14/%{name}-%{version}.tar.xz BuildRequires: pkg-config Requires: autoconf +# we need autoconf-archive >= 2014.10.15, as this is when ax_check_enable_debug.m4 and ax_code_coverage.m4 became part of it. +Requires: autoconf-archive >= 2014.10.15 Requires: automake Requires: gettext-tools # Avoiding pkgconfig()-style because we want glib-gettextize @@ -51,6 +53,8 @@ make %{?_smp_mflags} %install %make_install +# the files ax_check_enable_debug.m4 and ax_code_coverage.m4 live in autoconf-archive +rm %{buildroot}%{_datadir}/aclocal/{ax_check_enable_debug,ax_code_coverage}.m4 %clean rm -rf %{buildroot} @@ -64,8 +68,6 @@ rm -rf %{buildroot} %{_datadir}/aclocal/gnome-code-coverage.m4 %{_datadir}/aclocal/gnome-common.m4 %{_datadir}/aclocal/gnome-compiler-flags.m4 -%{_datadir}/aclocal/ax_check_enable_debug.m4 -%{_datadir}/aclocal/ax_code_coverage.m4 %{_datadir}/gnome-common/ %changelog