Accepting request 251897 from GNOME:Next

Push GNOME 3.14.0

OBS-URL: https://build.opensuse.org/request/show/251897
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-maps?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2014-09-25 07:50:52 +00:00 committed by Git OBS Bridge
parent 386ba9fd05
commit dc524af428
5 changed files with 34 additions and 57 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ee982dab476703e055be26440da9cfda2403f9c51713080843c84c023553386
size 783632

3
gnome-maps-3.14.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b432b851dea8ca7b04f11bab542c86f73513352315141d0977b3f49ede382efb
size 788060

View File

@ -1,46 +0,0 @@
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

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Sep 23 09:20:29 UTC 2014 - dimstar@opensuse.org
- Add gobject-introspection BuildRequires: enable detection of
typelib()-Requires (bnc#897852).
-------------------------------------------------------------------
Mon Sep 22 14:23:14 UTC 2014 - zaitor@opensuse.org
- Update to version 3.14.0:
+ Updated translations.
-------------------------------------------------------------------
Tue Sep 16 11:04:12 UTC 2014 - zaitor@opensuse.org
- Update to version 3.13.92:
+ Improve sidebar alignments.
+ Fix default transportation mode bug.
+ Make coordinates in entry editable.
+ Do not forget route on sidebar hide.
+ Hopefully a fix for non-consistent build error.
+ Hopefully a fix for elusive segfault in sidebar.
+ Default focus on entry in sidebar reveal.
+ Fix for theme problem with instruction list.
+ Updated translations.
- Drop gnome-maps-parallelbuild.patch: fixed upstream.
-------------------------------------------------------------------
Sun Sep 7 12:40:31 UTC 2014 - zaitor@opensuse.org

View File

@ -17,16 +17,15 @@
Name: gnome-maps
Version: 3.13.91
Version: 3.14.0
Release: 0
Summary: MAP Application for GNOME 3
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
Source: http://download.gnome.org/sources/gnome-maps/3.14/%{name}-%{version}.tar.xz
# Needed for typelib() Requires
BuildRequires: gobject-introspection
BuildRequires: hicolor-icon-theme
BuildRequires: intltool >= 0.40.0
BuildRequires: update-desktop-files
@ -45,11 +44,8 @@ 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}