Accepting request 295184 from GNOME:Apps

1

OBS-URL: https://build.opensuse.org/request/show/295184
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dia?expand=0&rev=42

dia-intltool-0.51.patch

@@ -0,0 +1,25 @@
+From 8ad49dc88f0cbd6410798707025091b5a964cba6 Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans@breuer.org>
+Date: Sat, 27 Sep 2014 22:03:03 +0200
+Subject: Bug 737255 - don't mess with localedir
+
+According to  Pacho Ramos https://bugzilla.gnome.org/show_bug.cgi?id=737255
+
+diff --git a/configure.in b/configure.in
+index 4c0bbea..b14c31b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -381,9 +381,6 @@ dnl INTLOBJS doesn't seem to always get subst'ed, but I believe it's
+ dnl idempotent
+ AC_SUBST(INTLOBJS)
+ 
+-localedir='${prefix}/${DATADIRNAME}/locale'
+-AC_SUBST(localedir)
+-
+ dnl
+ dnl Locate the gnome-xml library
+ dnl
+-- 
+cgit v0.10.2
+
+

dia.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  9 11:36:48 UTC 2015 - dimstar@opensuse.org
+
+- Add dia-intltool-0.51.patch: Fix installation of translations
+  using intltool 0.51.
+
 -------------------------------------------------------------------
 Sun Oct 19 10:44:44 UTC 2014 - dimstar@opensuse.org
 

dia.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dia
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,8 @@ Source1:        font-test-japanese.dia
 Source2:        font-test-czech.dia
 Source3:        font-test-german-euro.dia
 Source4:        dia.appdata.xml
+# PATCH-FIX-UPSTREAM dia-intltool-0.51.patch bgo#737255 dimstar@opensuse.org -- Fix installation of locales with intltool 0.51
+Patch0:         dia-intltool-0.51.patch
 # PATCH-FIX-OPENSUSE dia-0.92.2-no-strict-aliasing.patch
 Patch3:         dia-0.92.2-no-strict-aliasing.patch
 # PATCH-FIX-OPENSUSE dia-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare)
@@ -85,6 +87,7 @@ pages).
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 %patch3
 %patch17 -p1
 %patch20 -p1