From a587ea2459bd182ac38741eaae70f7eff314fbbb9108151bdf262603f63e0f8c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 22 Mar 2018 09:40:49 +0000 Subject: [PATCH] Accepting request 589303 from home:dimstar:t-u-u t-u-u / boo#1086036 OBS-URL: https://build.opensuse.org/request/show/589303 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=264 --- gtk2.changes | 7 +++++++ gtk2.spec | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gtk2.changes b/gtk2.changes index 46dd52c..5695786 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 20 17:13:36 UTC 2018 - dimstar@opensuse.org + +- Unconditionally enable translation-update-upstream: on + Tumbleweed, this results in a NOP and for Leap in SLE paid + translations being used (boo#1086036). + ------------------------------------------------------------------- Mon Feb 26 11:30:07 UTC 2018 - dimstar@opensuse.org diff --git a/gtk2.spec b/gtk2.spec index 26c5c46..48336c7 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -66,6 +66,7 @@ BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: pango-devel BuildRequires: pkgconfig +BuildRequires: translation-update-upstream BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) @@ -77,9 +78,6 @@ BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) >= 1.2.99 BuildRequires: pkgconfig(xrender) -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif %description GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -303,7 +301,6 @@ This package contains the development files for GTK+ 2.x. %prep %setup -q -n %{_name}-%{version} -%if !0%{?is_opensuse} translation-update-upstream translation-update-upstream po-properties gtk20-properties # remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains) @@ -314,7 +311,6 @@ for LNG in po/*.po ; do sed -i "/^$LNG\$/d" po/LINGUAS fi done -%endif gnome-patch-translation-prepare %if "%{_lib}" == "lib64" cp -a %{SOURCE2} .