From 9213207e89060d5bc430c4ec2b8a957c54962baf0e47bcefeb32eb9f2efbe0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 18 Apr 2016 12:19:53 +0000 Subject: [PATCH] Accepting request 390539 from home:dimstar:Factory Fix build for Factory with GNOME 3.20 OBS-URL: https://build.opensuse.org/request/show/390539 OBS-URL: https://build.opensuse.org/package/show/games/gnubg?expand=0&rev=25 --- gnubg.changes | 6 ++++++ gnubg.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gnubg.changes b/gnubg.changes index 798b179..1645ef7 100644 --- a/gnubg.changes +++ b/gnubg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 18 10:40:48 UTC 2016 - dimstar@opensuse.org + +- Remove local copy of glib-gettext.m4 in case we have one + available on the system. It can't be older than what gnubg ships. + ------------------------------------------------------------------- Thu Jan 15 16:45:05 UTC 2015 - p.drouand@gmail.com diff --git a/gnubg.spec b/gnubg.spec index 363bd62..3e456ee 100644 --- a/gnubg.spec +++ b/gnubg.spec @@ -1,7 +1,7 @@ # # spec file for package gnubg # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2003 Achim Mueller, Germany. # Updated by Christopher Hofmann in 2010 # @@ -104,6 +104,11 @@ Manual for GNU Backgammon. See description of gnubg for more details. %prep %setup -q gnubg +# if we have a glib-gettext.m4 installed in the system, we drop the +# local copy in gnubg. It certainly is older +if [ -f %{_datadir}/aclocal/glib-gettext.m4 ]; then + rm m4/glib-gettext.m4 +fi %build autoreconf -fi