From d869dcd7289d77203dcced6b5cb8be809692b2708cbc0c55f7df29767724e9b0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Sep 2017 20:32:21 +0000 Subject: [PATCH] Accepting request 522339 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/522339 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=359 --- gnome-control-center.changes | 6 +++ gnome-control-center.spec | 76 ++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 37 deletions(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 9b2e5db..d8b26e6 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -8,6 +8,12 @@ Mon Sep 4 15:49:10 UTC 2017 - zaitor@opensuse.org - Drop gnome-control-center-fix-finish-translation.patch: Fixed upstream. +------------------------------------------------------------------- +Fri Sep 1 13:51:26 UTC 2017 - zaitor@opensuse.org + +- Clean up the SLE patches structure, only keep what makes sense + for openSUSE, move the rest to patch tag PATCH-FEATURE-SLE. + ------------------------------------------------------------------- Fri Sep 1 12:51:26 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 299fd16..e9f7476 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -36,22 +36,27 @@ License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org Source: https://download.gnome.org/sources/gnome-control-center/3.25/%{name}-%{version}.tar.xz -# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, itweb-settings, tracker-preferences and Yast to g-c-c. -Patch0: gnome-control-center-allow-extra-tools-in-shell.patch -# PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch -Patch100: gnome-control-center-add-alacarte-for-sle.patch -# PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate -Patch16: gnome-control-center-probe-radius-server-cert.patch + +# PATCH-NEEDS-REBASE gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate Was: PATCH-FIX-UPSTREAM +Patch0: gnome-control-center-probe-radius-server-cert.patch # PATCH-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes -Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch -# PATCH-FIX-SLE gnome-control-center-890979-change-remote-passwd.patch bnc#890979 dliang@suse.com -- user: Enable remote user to change password in user panel -Patch18: gnome-control-center-890979-change-remote-passwd.patch +Patch1: gnome-control-center-follow-polkit-permissions-for-tz.patch # PATCH-NEEDS-REBASE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running was:PATCH-FIX-OPENSUSE -Patch20: gnome-control-center-disable-error-message-for-NM.patch -# PATCH-FIX-OPENSUSE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. -Patch21: gnome-control-center-info-never-use-gnome-software.patch -# PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions. -Patch22: gnome-control-center-more-power-button-actions.patch +Patch2: gnome-control-center-disable-error-message-for-NM.patch + +### SLE only patches get 1000 or more as number. + +# PATCH-FEATURE-SLE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, itweb-settings, tracker-preferences and Yast to g-c-c. +Patch1000: gnome-control-center-allow-extra-tools-in-shell.patch +# PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch +Patch1001: gnome-control-center-add-alacarte-for-sle.patch +# PATCH-FEATURE-SLE gnome-control-center-890979-change-remote-passwd.patch bnc#890979 dliang@suse.com -- user: Enable remote user to change password in user panel +Patch1002: gnome-control-center-890979-change-remote-passwd.patch +# PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. +Patch1003: gnome-control-center-info-never-use-gnome-software.patch +# PATCH-FEATURE-SLE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions. +Patch1004: gnome-control-center-more-power-button-actions.patch + BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -194,41 +199,38 @@ This package provides the online accounts onfiguration panel for GNOME control center. %lang_package + %prep %setup -q +%if %{with_cacert_patch} +%patch0 -p1 +%endif +%patch1 -p1 +# Needs rebase, again... +#patch2 -p1 +# SLE only patches 1000+ %if !0%{?is_opensuse} translation-update-upstream -%endif -%patch0 -p1 -# PATCH100 ONLY NEEDED FOR SLES AND TO BE APPLIED IMMEDIATELY AFTER PATCH0 -%if 0%{?suse_version} == 1500 && 0%{?sle_version} -%patch100 -p1 -%endif -%if %{with_cacert_patch} -%patch16 -p1 -%endif -%patch17 -p1 -%if ! 0%{?is_opensuse} -%patch18 -p1 -%endif -# Needs rebase, again... -#patch20 -p1 -%if 0%{?suse_version} == 1500 -%patch21 -p1 -%patch22 -p1 +%patch1000 -p1 +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 +%patch1004 -p1 %endif %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh -%configure --with-pic\ - --disable-static\ - --disable-maintainer-mode\ +%configure \ + --with-pic \ + --disable-static \ + --disable-maintainer-mode \ %if %{with_ibus} - --enable-ibus + --enable-ibus \ %else - --disable-ibus + --ibus-disable \ %endif + %{nil} pushd panels/common make gsd-common-enums.h popd