Accepting request 246875 from GNOME:Next

Add gnome-maps-parallelbuild.patch: Fix rules used to make parallel build more reliable (bgo#734507).

OBS-URL: https://build.opensuse.org/request/show/246875
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-maps?expand=0&rev=23

gnome-maps-parallelbuild.patch

@@ -0,0 +1,46 @@
+From 2cd8913be7de51733509916e79d58dcf47938280 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Sun, 24 Aug 2014 13:38:24 +0200
+Subject: [PATCH] Build: fix make rules for parallel build
+
+https://bugzilla.gnome.org/show_bug.cgi?id=734507
+---
+ configure.ac       |  2 ++
+ src/Makefile-js.am | 10 +---------
+ 2 files changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cb9d245..406b9ab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,5 +54,7 @@ AC_CONFIG_FILES([
+     data/org.gnome.Maps.desktop.in
+     data/icons/Makefile
+     po/Makefile.in
++    src/config.js
++    src/path.js
+ ])
+ AC_OUTPUT
+diff --git a/src/Makefile-js.am b/src/Makefile-js.am
+index 3737997..4561ffe 100644
+--- a/src/Makefile-js.am
++++ b/src/Makefile-js.am
+@@ -1,14 +1,6 @@
+-BUILT_SOURCES +=							\
+-	path.js								\
+-	config.js
+-
+-path.js: Makefile path.js.in
+-	$(AM_V_GEN) $(do_subst) $(srcdir)/path.js.in > $(builddir)/path.js
+-config.js: Makefile config.js.in
+-	$(AM_V_GEN) $(do_subst) $(srcdir)/config.js.in > $(builddir)/config.js
+-
+ js_files = $(shell $(GLIB_COMPILE_RESOURCES)				\
+ 		--sourcedir=$(srcdir)					\
++		--sourcedir=$(builddir)                                 \
+ 		--generate-dependencies $(srcdir)/gnome-maps.js.gresource.xml)
+ 
+ gnome-maps-js.h: gnome-maps.js.gresource.xml $(js_files)
+-- 
+2.0.4
+

gnome-maps.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Aug 24 12:07:50 UTC 2014 - dimstar@opensuse.org
+
+- Add gnome-maps-parallelbuild.patch: Fix rules used to make
+  parallel build more reliable (bgo#734507).
+
 -------------------------------------------------------------------
 Sat Jul 19 21:00:14 UTC 2014 - zaitor@opensuse.org
 

gnome-maps.spec

@@ -24,6 +24,8 @@ License:        GPL-2.0+
 Group:          Productivity/Other
 Url:            https://live.gnome.org/Design/Apps/Maps
 Source:         http://download.gnome.org/sources/gnome-maps/3.13/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-maps-parallelbuild.patch bgo#734507 dimstar@opensuse.org -- Fix parallel build rules
+Patch0:         gnome-maps-parallelbuild.patch
 BuildRequires:  gnome-common
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool >= 0.40.0
@@ -43,8 +45,11 @@ Maps is a map application for GNOME 3.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+# Needed for patch0
+NOCONFIGURE=1 gnome-autogen.sh
 %configure
 make %{?_smp_mflags}