From c9a7ec92ec018e653e28a160c3b7ea829ef7837eb0f00d77aacc814ca77c36ff Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 12 Mar 2015 10:29:54 +0000 Subject: [PATCH] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=272 --- gnome-control-center.changes | 10 ++++++++++ gnome-control-center.spec | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 9296d22..7da455b 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 12 10:26:55 UTC 2015 - dimstar@opensuse.org + +- Add with_cacert_patch condition. When enabled: + + Add NetworkManager(cacert-patch) Requires + + Apply gnome-control-center-probe-radius-server-cert.patch + + This needs to be toggled whenever NetworkManager is updated + and the nm-probe-radius-server-cert.patch there is not rebased + yet. + ------------------------------------------------------------------- Wed Mar 11 08:52:48 UTC 2015 - glin@suse.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 8da9de6..90becfb 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -26,6 +26,8 @@ %define with_wacom 1 %endif +%define with_cacert_patch 1 + Name: gnome-control-center Version: 3.14.2 Release: 0 @@ -127,6 +129,9 @@ Recommends: cups-pk-helper Recommends: dbus(com.intel.dleyna-server) # the printers panel can use the dbus service Recommends: system-config-printer-dbus-service +%if %{with_cacert_patch} +Requires: NetworkManager(cacert-patch) +%endif Provides: acme Provides: fontilus Provides: themus @@ -184,7 +189,9 @@ translation-update-upstream %patch0 -p1 %patch1 -p1 %patch15 -p1 +%if %{with_cacert_patch} %patch16 -p1 +%endif %patch17 -p1 #NEEDS-REBASE #patch14 -p1