Accepting request 590016 from GNOME:Factory

t-u-u / boo#1086036 (forwarded request 589329 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/590016
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=163
This commit is contained in:
Dominique Leuenberger 2018-03-26 10:48:39 +00:00 committed by Git OBS Bridge
commit 493dc75d80
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 20 17:27:38 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 Mar 12 19:25:22 UTC 2018 - dimstar@opensuse.org Mon Mar 12 19:25:22 UTC 2018 - dimstar@opensuse.org

View File

@ -54,6 +54,7 @@ BuildRequires: intltool
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: meson BuildRequires: meson
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xsltproc BuildRequires: xsltproc
BuildRequires: pkgconfig(accountsservice) >= 0.6.39 BuildRequires: pkgconfig(accountsservice) >= 0.6.39
@ -128,9 +129,6 @@ Obsoletes: control-center2 < 2.22.1
Obsoletes: gnome-control-center-branding <= 12.3 Obsoletes: gnome-control-center-branding <= 12.3
Obsoletes: gnome-control-center-branding-openSUSE <= 12.3 Obsoletes: gnome-control-center-branding-openSUSE <= 12.3
Obsoletes: gnome-control-center-branding-upstream <= 12.3 Obsoletes: gnome-control-center-branding-upstream <= 12.3
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
%description %description
The control center is GNOME's main interface for configuration of The control center is GNOME's main interface for configuration of
@ -186,10 +184,10 @@ GNOME control center.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
translation-update-upstream
# SLE-only patches 1000+ # SLE-only patches 1000+
%if !0%{?is_opensuse} %if !0%{?is_opensuse}
translation-update-upstream
%patch1000 -p1 %patch1000 -p1
%patch1001 -p1 %patch1001 -p1
%patch1002 -p1 %patch1002 -p1