From 20b1a74c5135ce069fc556f8ba39ca5f31dcb4e2df03c710035f94d0ba0083a4 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sat, 15 Oct 2011 06:26:02 +0000
Subject: [PATCH 1/2] Accepting request 87898 from
 home:sbrabec:branches:GNOME:Factory

- Fixed translation-update-upstream support (bnc#690180).

OBS-URL: https://build.opensuse.org/request/show/87898
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=150
---
 gtk2.changes |  5 +++++
 gtk2.spec    | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/gtk2.changes b/gtk2.changes
index 094db79..0d82795 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 14 17:20:07 CEST 2011 - sbrabec@suse.cz
+
+- Fixed translation-update-upstream support (bnc#690180).
+
 -------------------------------------------------------------------
 Wed Aug 31 09:52:22 CEST 2011 - vuntz@opensuse.org
 
diff --git a/gtk2.spec b/gtk2.spec
index 816fffb..f68b416 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -300,9 +300,18 @@ This package contains the development files for GTK+ 2.x.
 # Hacky workaround against broken tarball; the test will fail when it can be removed (see bgo#658039)
 test "x`wc -l tests/testtreeview.c`" = "x38 tests/testtreeview.c"
 sed -i "s/\ttesttreeview\t//g" tests/Makefile.am
-# This breaks the build, so disabled for now (see bnc#690180)
-#translation-update-upstream
-#translation-update-upstream po-properties gtk20-properties
+translation-update-upstream
+translation-update-upstream po-properties gtk20-properties
+# remove incomplete translations (global LINGUAS file, two domains)
+cd po
+for LNG in *.po ; do
+    LNG=${LNG%.po}
+    if ! test -f ../po-properties/$LNG.po ; then
+        echo "Removing incomplete $LNG from LINGUAS."
+        sed -i "/^$LNG\$/d" LINGUAS
+    fi
+done
+cd ..
 gnome-patch-translation-prepare
 %if "%_lib" == "lib64"
 cp -a %{S:2} .

From b7358fcc7b4ed631945c990721a1e142859c4cc7dabdaa1c2c310c9dbdc8d640 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sat, 15 Oct 2011 07:06:24 +0000
Subject: [PATCH 2/2] Accepting request 87988 from
 home:vuntz:branches:GNOME:Factory

tweak sbrabec's change

OBS-URL: https://build.opensuse.org/request/show/87988
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=151
---
 gtk2.spec | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gtk2.spec b/gtk2.spec
index f68b416..627bd54 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -302,16 +302,14 @@ test "x`wc -l tests/testtreeview.c`" = "x38 tests/testtreeview.c"
 sed -i "s/\ttesttreeview\t//g" tests/Makefile.am
 translation-update-upstream
 translation-update-upstream po-properties gtk20-properties
-# remove incomplete translations (global LINGUAS file, two domains)
-cd po
-for LNG in *.po ; do
-    LNG=${LNG%.po}
-    if ! test -f ../po-properties/$LNG.po ; then
+# remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains)
+for LNG in po/*.po ; do
+    LNG=`basename ${LNG%%.po}`
+    if ! test -f po-properties/$LNG.po ; then
         echo "Removing incomplete $LNG from LINGUAS."
-        sed -i "/^$LNG\$/d" LINGUAS
+        sed -i "/^$LNG\$/d" po/LINGUAS
     fi
 done
-cd ..
 gnome-patch-translation-prepare
 %if "%_lib" == "lib64"
 cp -a %{S:2} .