diff --git a/control-center-network-add-domain-suffix-match.patch b/control-center-network-add-domain-suffix-match.patch index a434b8d..31cbeef 100644 --- a/control-center-network-add-domain-suffix-match.patch +++ b/control-center-network-add-domain-suffix-match.patch @@ -1,561 +1,3 @@ -From 4b5380184b9c1c39f2a5b8d48dc9a8cad9a85ed9 mon sep 17 00:00:00 2001 -From: Jonathan Kang -Date: Tue, 19 Sep 2017 11:15:36 +0800 -Subject: [PATCH 1/2] wifi: Use GtkGrid for Wi-Fi Security settings page - -GtkTable is deprecated. Use GtkGrid instead. - -https://bugzilla.gnome.org/show_bug.cgi?id=787882 ---- - .../network/wireless-security/eap-method-peap.ui | 97 +++++++++------------- - panels/network/wireless-security/eap-method-tls.ui | 77 ++++++----------- - .../network/wireless-security/eap-method-ttls.ui | 49 ++++------- - 3 files changed, 80 insertions(+), 143 deletions(-) - -diff --git a/panels/network/wireless-security/eap-method-peap.ui b/panels/network/wireless-security/eap-method-peap.ui -index 8b8959cd6..37dddd643 100644 ---- a/panels/network/wireless-security/eap-method-peap.ui -+++ b/panels/network/wireless-security/eap-method-peap.ui -@@ -35,11 +35,9 @@ - False - False - -- -+ - True - False -- 5 -- 2 - 6 - 6 - -@@ -52,20 +50,20 @@ - eap_peap_anon_identity_entry - - -- GTK_FILL -- -+ 0 -+ 0 - - - - - True - True -+ True - True - - - 1 -- 2 -- -+ 0 - - - -@@ -78,24 +76,19 @@ - eap_peap_ca_cert_button - - -+ 0 - 1 -- 2 -- GTK_FILL -- - - - - - True - False -+ True - - - 1 -- 2 - 1 -- 2 -- GTK_FILL -- GTK_FILL - - - -@@ -103,32 +96,46 @@ - No CA certificate is _required - True - True -+ True - False - True - True - - - 1 -- 2 - 2 -- 3 -- GTK_FILL -- - - - -- -+ -+ True -+ False -+ 1 -+ PEAP _version -+ True -+ eap_peap_version_combo -+ -+ -+ 0 -+ 3 -+ -+ -+ -+ - True - False -+ True -+ model9 - -- -+ -+ -+ 0 -+ - - - -- 2 -- 5 -- 6 -- GTK_FILL -+ 1 -+ 3 - - - -@@ -141,16 +148,15 @@ - eap_peap_inner_auth_combo - - -+ 0 - 4 -- 5 -- GTK_FILL -- - - - - - True - False -+ True - model8 - - -@@ -161,48 +167,21 @@ - - - 1 -- 2 - 4 -- 5 -- GTK_FILL -- GTK_FILL - - - -- -- True -- False -- 1 -- PEAP _version -- True -- eap_peap_version_combo -- -- -- 3 -- 4 -- GTK_FILL -- -- -- -- -- -+ - True - False -- model9 - -- -- -- 0 -- -+ - - - -- 1 -- 2 -- 3 -- 4 -- GTK_FILL -- GTK_FILL -+ 0 -+ 5 -+ 2 - - - -diff --git a/panels/network/wireless-security/eap-method-tls.ui b/panels/network/wireless-security/eap-method-tls.ui -index 886767de9..a399460fa 100644 ---- a/panels/network/wireless-security/eap-method-tls.ui -+++ b/panels/network/wireless-security/eap-method-tls.ui -@@ -7,12 +7,10 @@ - False - False - -- -+ - True - False - start -- 6 -- 2 - 6 - 6 - -@@ -28,20 +26,20 @@ - eap_tls_identity_entry - - -- GTK_FILL -- -+ 0 -+ 0 - - - - - True - True -+ True - True - - - 1 -- 2 -- -+ 0 - - - -@@ -54,10 +52,19 @@ - eap_tls_user_cert_button - - -+ 0 -+ 1 -+ -+ -+ -+ -+ True -+ False -+ True -+ -+ -+ 1 - 1 -- 2 -- GTK_FILL -- - - - -@@ -70,24 +77,19 @@ - eap_tls_ca_cert_button - - -+ 0 - 2 -- 3 -- GTK_FILL -- - - - - - True - False -+ True - - - 1 -- 2 - 2 -- 3 -- GTK_FILL -- GTK_FILL - - - -@@ -95,17 +97,14 @@ - No CA certificate is _required - True - True -+ True - False - True - True - - - 1 -- 2 - 3 -- 4 -- GTK_FILL -- - - - -@@ -118,24 +117,19 @@ - eap_tls_private_key_button - - -+ 0 - 4 -- 5 -- GTK_FILL -- - - - - - True - False -+ True - - - 1 -- 2 - 4 -- 5 -- GTK_FILL -- GTK_FILL - - - -@@ -148,25 +142,21 @@ - eap_tls_private_key_password_entry - - -+ 0 - 5 -- 6 -- GTK_FILL -- - - - - - True - True -+ True - False - True - - - 1 -- 2 - 5 -- 6 -- - - - -@@ -174,31 +164,14 @@ - Sho_w password - True - True -+ True - False - True - True - - - 1 -- 2 - 6 -- 7 -- GTK_FILL -- -- -- -- -- -- True -- False -- -- -- 1 -- 2 -- 1 -- 2 -- GTK_FILL -- GTK_FILL - - - -diff --git a/panels/network/wireless-security/eap-method-ttls.ui b/panels/network/wireless-security/eap-method-ttls.ui -index 4047f9fc8..0b23c54ba 100644 ---- a/panels/network/wireless-security/eap-method-ttls.ui -+++ b/panels/network/wireless-security/eap-method-ttls.ui -@@ -18,11 +18,9 @@ - False - False - -- -+ - True - False -- 4 -- 2 - 6 - 6 - -@@ -35,20 +33,20 @@ - eap_ttls_anon_identity_entry - - -- GTK_FILL -- -+ 0 -+ 0 - - - - - True - True -+ True - True - - - 1 -- 2 -- -+ 0 - - - -@@ -61,24 +59,19 @@ - eap_ttls_ca_cert_button - - -+ 0 - 1 -- 2 -- GTK_FILL -- - - - - - True - False -+ True - - - 1 -- 2 - 1 -- 2 -- GTK_FILL -- GTK_FILL - - - -@@ -87,38 +80,35 @@ - True - True - False -+ start -+ True - True - True - - - 1 -- 2 - 2 -- 3 -- GTK_FILL -- - - - - - True - False -- 1 -- _Inner authentication -+ _Inner authentication: - True - eap_ttls_inner_auth_combo -+ 1 - - -+ 0 - 3 -- 4 -- GTK_FILL -- -- -- -+ -+ - - - True - False -+ True - model6 - - -@@ -129,11 +119,7 @@ - - - 1 -- 2 - 3 -- 4 -- GTK_FILL -- GTK_FILL - - - -@@ -146,10 +132,9 @@ - - - -- 2 -+ 0 - 4 -- 5 -- GTK_FILL -+ 2 - - - --- -2.13.5 - - From e48d32e5699d824dc229f131246229f077709f84 Mon Sep 17 00:00:00 2001 From: Jonathan Kang Date: Tue, 19 Sep 2017 17:00:18 +0800 diff --git a/gnome-control-center-3.26.2.tar.xz b/gnome-control-center-3.26.2.tar.xz deleted file mode 100644 index a15912e..0000000 --- a/gnome-control-center-3.26.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5 -size 7386516 diff --git a/gnome-control-center-3.27.92.tar.xz b/gnome-control-center-3.27.92.tar.xz new file mode 100644 index 0000000..c243ca5 --- /dev/null +++ b/gnome-control-center-3.27.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08516b7ed16cd36a48b1cb55e5f4733a70ba0433233cb803e044af3458a2048c +size 5899032 diff --git a/gnome-control-center-bring-back-firewall-zone.patch b/gnome-control-center-bring-back-firewall-zone.patch index 3c03398..56f2c29 100644 --- a/gnome-control-center-bring-back-firewall-zone.patch +++ b/gnome-control-center-bring-back-firewall-zone.patch @@ -17,19 +17,18 @@ This reverts commit b36924567e16839fbdc8796b975970e214719d81. panels/network/connection-editor/vpn-page.ui | 39 +++++++ 10 files changed, 299 insertions(+) -Index: gnome-control-center-3.26.1/panels/network/connection-editor/Makefile.am +Index: b/panels/network/connection-editor/meson.build =================================================================== ---- gnome-control-center-3.26.1.orig/panels/network/connection-editor/Makefile.am -+++ gnome-control-center-3.26.1/panels/network/connection-editor/Makefile.am -@@ -28,6 +28,8 @@ libconnection_editor_la_SOURCES = \ - ce-page-vpn.c \ - vpn-helpers.h \ - vpn-helpers.c \ -+ firewall-helpers.h \ -+ firewall-helpers.c \ - ui-helpers.h \ - ui-helpers.c - +--- a/panels/network/connection-editor/meson.build ++++ b/panels/network/connection-editor/meson.build +@@ -10,6 +10,7 @@ sources = files( + 'ce-page-vpn.c', + 'ce-page-wifi.c', + 'ce-page.c', ++ 'firewall-helpers.h', + 'net-connection-editor.c', + 'ui-helpers.c', + 'vpn-helpers.c' Index: gnome-control-center-3.26.1/panels/network/connection-editor/ce-page-ethernet.c =================================================================== --- gnome-control-center-3.26.1.orig/panels/network/connection-editor/ce-page-ethernet.c diff --git a/gnome-control-center-disable-error-message-for-NM.patch b/gnome-control-center-disable-error-message-for-NM.patch index a9c26f1..e5e2ff5 100644 --- a/gnome-control-center-disable-error-message-for-NM.patch +++ b/gnome-control-center-disable-error-message-for-NM.patch @@ -1,7 +1,7 @@ -Index: gnome-control-center-3.26.1/panels/network/cc-network-panel.c +Index: gnome-control-center-3.27.92/panels/network/cc-network-panel.c =================================================================== ---- gnome-control-center-3.26.1.orig/panels/network/cc-network-panel.c -+++ gnome-control-center-3.26.1/panels/network/cc-network-panel.c +--- gnome-control-center-3.27.92.orig/panels/network/cc-network-panel.c ++++ gnome-control-center-3.27.92/panels/network/cc-network-panel.c @@ -765,10 +765,24 @@ panel_check_network_manager_version (CcN GtkWidget *label; gchar *markup; @@ -56,11 +56,11 @@ Index: gnome-control-center-3.26.1/panels/network/cc-network-panel.c } static void -Index: gnome-control-center-3.26.1/panels/network/cc-wifi-panel.c +Index: gnome-control-center-3.27.92/panels/network/cc-wifi-panel.c =================================================================== ---- gnome-control-center-3.26.1.orig/panels/network/cc-wifi-panel.c -+++ gnome-control-center-3.26.1/panels/network/cc-wifi-panel.c -@@ -120,16 +120,35 @@ static void +--- gnome-control-center-3.27.92.orig/panels/network/cc-wifi-panel.c ++++ gnome-control-center-3.27.92/panels/network/cc-wifi-panel.c +@@ -120,17 +120,36 @@ static void check_main_stack_page (CcWifiPanel *self) { const gchar *nm_version; @@ -86,7 +86,8 @@ Index: gnome-control-center-3.26.1/panels/network/cc-wifi-panel.c gtk_stack_set_visible_child_name (self->main_stack, "nm-not-running"); + else if (g_strcmp0 (state, "active") == 0) + gtk_stack_set_visible_child_name (self->main_stack, "wicked-running"); - else if (self->devices->len == 0) + else if (self->devices->len == 0 || + !nm_client_wireless_get_enabled (self->client)) gtk_stack_set_visible_child_name (self->main_stack, "no-wifi-devices"); else gtk_stack_set_visible_child_name (self->main_stack, "wifi-connections"); @@ -97,11 +98,11 @@ Index: gnome-control-center-3.26.1/panels/network/cc-wifi-panel.c } static void -Index: gnome-control-center-3.26.1/panels/network/wifi.ui +Index: gnome-control-center-3.27.92/panels/network/wifi.ui =================================================================== ---- gnome-control-center-3.26.1.orig/panels/network/wifi.ui -+++ gnome-control-center-3.26.1/panels/network/wifi.ui -@@ -298,6 +298,48 @@ +--- gnome-control-center-3.27.92.orig/panels/network/wifi.ui ++++ gnome-control-center-3.27.92/panels/network/wifi.ui +@@ -293,6 +293,48 @@ nm-not-running diff --git a/gnome-control-center-follow-polkit-permissions-for-tz.patch b/gnome-control-center-follow-polkit-permissions-for-tz.patch deleted file mode 100644 index b102281..0000000 --- a/gnome-control-center-follow-polkit-permissions-for-tz.patch +++ /dev/null @@ -1,107 +0,0 @@ -Index: gnome-control-center-3.18.2/panels/datetime/cc-datetime-panel.c -=================================================================== ---- gnome-control-center-3.18.2.orig/panels/datetime/cc-datetime-panel.c -+++ gnome-control-center-3.18.2/panels/datetime/cc-datetime-panel.c -@@ -59,6 +59,7 @@ enum { - #define W(x) (GtkWidget*) gtk_builder_get_object (priv->builder, x) - - #define DATETIME_PERMISSION "org.gnome.controlcenter.datetime.configure" -+#define DATETIME_TZ_PERMISSION "org.freedesktop.timedate1.set-timezone" - - #define CLOCK_SCHEMA "org.gnome.desktop.interface" - #define CLOCK_FORMAT_KEY "clock-format" -@@ -99,6 +100,7 @@ struct _CcDateTimePanelPrivate - GCancellable *cancellable; - - GPermission *permission; -+ GPermission *tz_permission; - }; - - static void update_time (CcDateTimePanel *self); -@@ -133,6 +135,7 @@ cc_date_time_panel_dispose (GObject *obj - g_clear_object (&priv->clock_tracker); - g_clear_object (&priv->dtm); - g_clear_object (&priv->permission); -+ g_clear_object (&priv->tz_permission); - g_clear_object (&priv->clock_settings); - g_clear_object (&priv->datetime_settings); - g_clear_object (&priv->filechooser_settings); -@@ -777,24 +780,24 @@ on_permission_changed (GPermission *perm - gpointer data) - { - CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv; -- gboolean allowed, auto_timezone, using_ntp; -+ gboolean allowed, tz_allowed, auto_timezone, using_ntp; - - allowed = (priv->permission != NULL && g_permission_get_allowed (priv->permission)); -+ tz_allowed = (priv->tz_permission != NULL && g_permission_get_allowed (priv->tz_permission)); - using_ntp = gtk_switch_get_active (GTK_SWITCH (W("network_time_switch"))); - auto_timezone = gtk_switch_get_active (GTK_SWITCH (W("auto_timezone_switch"))); - - /* All the widgets but the lock button and the 24h setting */ - gtk_widget_set_sensitive (W("auto-datetime-row"), allowed); -- gtk_widget_set_sensitive (W("auto-timezone-row"), allowed); -+ gtk_widget_set_sensitive (W("auto-timezone-row"), allowed || tz_allowed); - gtk_widget_set_sensitive (W("datetime-button"), allowed && !using_ntp); -- gtk_widget_set_sensitive (W("timezone-button"), allowed && !auto_timezone); -+ gtk_widget_set_sensitive (W("timezone-button"), (allowed || tz_allowed) && !auto_timezone); - - /* Hide the subdialogs if we no longer have permissions */ - if (!allowed) -- { - gtk_widget_hide (GTK_WIDGET (W ("datetime-dialog"))); -+ if (!allowed && !tz_allowed) - gtk_widget_hide (GTK_WIDGET (W ("timezone-dialog"))); -- } - } - - static void -@@ -886,6 +889,25 @@ run_dialog (CcDateTimePanel *self, - } - - static gboolean -+tz_switch_to_row_transform_func (GBinding *binding, -+ const GValue *source_value, -+ GValue *target_value, -+ CcDateTimePanel *self) -+{ -+ CcDateTimePanelPrivate *priv = self->priv; -+ gboolean active; -+ gboolean allowed; -+ -+ active = g_value_get_boolean (source_value); -+ allowed = (priv->permission != NULL && g_permission_get_allowed (priv->permission)) || -+ (priv->tz_permission != NULL && g_permission_get_allowed (priv->tz_permission)); -+ -+ g_value_set_boolean (target_value, !active && allowed); -+ -+ return TRUE; -+} -+ -+static gboolean - switch_to_row_transform_func (GBinding *binding, - const GValue *source_value, - GValue *target_value, -@@ -1266,6 +1288,7 @@ cc_date_time_panel_init (CcDateTimePanel - - /* add the lock button */ - priv->permission = polkit_permission_new_sync (DATETIME_PERMISSION, NULL, NULL, NULL); -+ priv->tz_permission = polkit_permission_new_sync (DATETIME_TZ_PERMISSION, NULL, NULL, NULL); - if (priv->permission != NULL) - { - g_signal_connect (priv->permission, "notify", -@@ -1303,9 +1326,11 @@ cc_date_time_panel_init (CcDateTimePanel - gtk_widget_set_visible (W ("auto-datetime-row"), is_ntp_available (self)); - - /* Timezone settings */ -- bind_switch_to_row (self, -- W ("auto_timezone_switch"), -- W ("timezone-button")); -+ g_object_bind_property_full (W ("auto_timezone_switch"), "active", -+ W ("timezone-button"), "sensitive", -+ G_BINDING_SYNC_CREATE, -+ (GBindingTransformFunc) tz_switch_to_row_transform_func, -+ NULL, self, NULL); - - priv->datetime_settings = g_settings_new (DATETIME_SCHEMA); - g_settings_bind (priv->datetime_settings, AUTO_TIMEZONE_KEY, diff --git a/gnome-control-center.changes b/gnome-control-center.changes index fcb6a3c..c6ae302 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Tue Mar 6 10:24:26 UTC 2018 - dimstar@opensuse.org + +- Update to version 3.27.92: + + Network: + - Use monospace font for Wi-Fi hotspot password. + - Add a new empty page for Wi-Fi when no adapter is found. + - Don't show "Auto-connect" option for VPNs. + + Power: Don't treat device batteries as power supplies. + + Printers: + - Add new command line actions: "authenticate-jobs" and + "show-jobs". + - Add authentication dialog for print jobs. + - Improve code robustness. + + User Accounts: Don't show legacy faces. + + Updated translations. +- Rebase gnome-control-center-disable-error-message-for-NM.patch. +- Drop gnome-control-center-icon-name.patch: fixed upstream. + +------------------------------------------------------------------- +Wed Feb 28 16:27:47 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- +Mon Feb 19 11:12:52 UTC 2018 - dimstar@opensuse.org + +- Add gnome-control-center-icon-name.patch: Fix the icon names as + installed to the system (glgo#GNOME/gnome-control-center#3). + +------------------------------------------------------------------- +Tue Feb 6 21:06:56 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 3.27.90: + + Split the window decorations between the header bars. + + Disable the menubar. And drop the old shell. + + Allow search to be filtered by panel "keywords". + + Port to meson build system and drop autotools. + + Make Bluetooth, Network, and Wacom panels mandatory on Linux. + + Remember the last used panel. + + Info: Ignore more virtual filesystems. + + Network: + - Make asynchronous calls cancellable; + - Allow empty 802.1x certificate passwords; + - Avoid crashing if NM reports no devices or no connections; + - Consider empty IPv6 gateway to be valid; + + Notifications: Add link to help/documentation. + + Power: + - Add gaming input devices label; + - Add 20 and 25 minutes suspend timeouts (complying with EU + energy regulations). + + Printers: + - Stay backwards compatible with old cups; + - Don't show the supply level bar if there's no ink info. + + Privacy: Add link to Location Services privacy policy. + + Sound: + - Update art work (new icons); + - Respect setting (gsetting) for allowing output volume over + 100%; + - Update gvc to not require ALSA support. + + User Accounts: + - Fix password strength check; + - Update user face pictures (new pictures); + - Introduce a new avatar chooser popover. + + Wacom: Add support for three-button styli. + + Updated translation. +- Add meson BuildRequires, replace configure/make/make_install + macros with meson/meson_build/meson_install and remove call for + gnome-autogen.sh. All of these changes reflect the upstream port + to Meson build system. +- Add gobject-2.0, gthread-2.0 and gdk-wayland-3.0 pkgconfig + modules and xsltproc BuildRequires avoiding implicit + dependencies. +- Drop gnome-common BuildRequires: it's no longer required anymore. +- Port gnome-control-center-bring-back-firewall-zone.patch's + autotools-based chunk to Meson build system. +- Drop gnome-control-center-follow-polkit-permissions-for-tz.patch: + merged upstream. +- Remove control-center-network-add-domain-suffix-match.patch's + first part: merged upstream. + ------------------------------------------------------------------- Thu Dec 7 10:01:26 UTC 2017 - fezhang@suse.com @@ -5,6 +86,12 @@ Thu Dec 7 10:01:26 UTC 2017 - fezhang@suse.com gnome-control-center-add-alacarte-for-sle.patch: The new UI doesn't have a main window with all icons any more (bsc#1071214). +------------------------------------------------------------------- +Wed Nov 1 23:05:01 UTC 2017 - luc14n0@linuxmail.org + +- Drop %glib2_gsettings_schema_requires macro: the functionality + now is covered by file triggers. + ------------------------------------------------------------------- Wed Nov 1 18:39:45 UTC 2017 - dimstar@opensuse.org @@ -5329,11 +5416,6 @@ Sat Jan 17 01:54:00 CET 2009 - crrodriguez@suse.de ------------------------------------------------------------------- Fri Jan 9 14:04:20 CST 2009 - federico@novell.com -- Remove gnome-control-center-randr-gerror.diff. Fixed upstream - -------------------------------------------------------------------- -Fri Jan 9 14:04:20 CST 2009 - federico@novell.com - - Added gnome-control-center-randr-gerror.diff. This adds good error reporting when changing the multihead configuration, and fixes these bugs: diff --git a/gnome-control-center.spec b/gnome-control-center.spec index e79964a..e0490c2 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-control-center # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,96 +18,86 @@ # Allow to enable/disable ibus, as GNOME is rather strict on new versions. %define with_ibus 1 - # Wacom input support %ifarch s390 s390x %define with_wacom 0 %else %define with_wacom 1 %endif - +%{?with_ibus:BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2} +%{?with_wacom:BuildRequires: pkgconfig(clutter-1.0) >= 1.11.3 pkgconfig(libwacom) >= 0.7} Name: gnome-control-center -Version: 3.26.2 +Version: 3.27.92 Release: 0 Summary: The GNOME Control Center -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/GNOME -Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-control-center/3.26/%{name}-%{version}.tar.xz - -# 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 -Patch1: gnome-control-center-follow-polkit-permissions-for-tz.patch +URL: https://www.gnome.org +Source: http://download.gnome.org/sources/gnome-control-center/3.27/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE 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 -Patch2: gnome-control-center-disable-error-message-for-NM.patch +Patch0: gnome-control-center-disable-error-message-for-NM.patch # PATCH-FIX-UPSTREAM control-center-network-add-domain-suffix-match.patch bgo#787882 bsc#1047509 sckang@suse.com -- wifi: Add domain-suffix-match entry -Patch3: control-center-network-add-domain-suffix-match.patch - -### SLE only patches get 1000 or more as number. - +Patch1: control-center-network-add-domain-suffix-match.patch +### SLE-only patches get 1000 or more as number. # 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 +Patch1000: 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 +Patch1001: 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 +Patch1002: gnome-control-center-more-power-button-actions.patch # PATCH-FEATURE-SLE gnome-control-center-bring-back-firewall-zone.patch fate#316719 sckang@suse.com -- network: Bring back the firewall zone combo box to select proper firewall zone for each connection. -Patch1005: gnome-control-center-bring-back-firewall-zone.patch - -BuildRequires: cups-devel +Patch1003: gnome-control-center-bring-back-firewall-zone.patch +BuildRequires: cups-devel >= 1.4 BuildRequires: desktop-file-utils BuildRequires: fdupes -BuildRequires: gnome-common BuildRequires: intltool BuildRequires: krb5-devel -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif +BuildRequires: meson +BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: xsltproc BuildRequires: pkgconfig(accountsservice) >= 0.6.39 BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(cheese) -BuildRequires: pkgconfig(cheese-gtk) >= 3.3.91 +BuildRequires: pkgconfig(cheese-gtk) >= 3.5.91 BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(colord) >= 0.1.34 BuildRequires: pkgconfig(colord-gtk) >= 0.1.24 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.0 +BuildRequires: pkgconfig(gdk-wayland-3.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) >= 2.53.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2 -BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.19.93 -BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.92 +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.27.90 +BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.90 BuildRequires: pkgconfig(goa-1.0) >= 3.25.3 BuildRequires: pkgconfig(goa-backend-1.0) +BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(grilo-0.3) >= 0.2.12 -BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.21.4 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 +BuildRequires: pkgconfig(grilo-0.3) >= 0.3.0 +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.27.2 +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.20 BuildRequires: pkgconfig(gudev-1.0) -%if %{with_ibus} -BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2 -%endif BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgtop-2.0) -BuildRequires: pkgconfig(libnm) >= 1.2 +BuildRequires: pkgconfig(libnm) >= 1.2.0 BuildRequires: pkgconfig(libnm-glib-vpn) >= 1.2 BuildRequires: pkgconfig(libnm-gtk) >= 1.2 -BuildRequires: pkgconfig(libnma) >= 1.2 +BuildRequires: pkgconfig(libnma) >= 1.2.0 BuildRequires: pkgconfig(libpulse) >= 2.0 -BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 +BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(libsoup-2.4) -%if %{with_wacom} -BuildRequires: pkgconfig(libwacom) >= 0.7 -%endif BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(mm-glib) >= 0.7 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 BuildRequires: pkgconfig(pwquality) >= 1.2.2 BuildRequires: pkgconfig(smbclient) -BuildRequires: pkgconfig(upower-glib) >= 0.99.0 +BuildRequires: pkgconfig(upower-glib) >= 0.99.6 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xft) @@ -138,8 +128,9 @@ Obsoletes: control-center2 < 2.22.1 Obsoletes: gnome-control-center-branding <= 12.3 Obsoletes: gnome-control-center-branding-openSUSE <= 12.3 Obsoletes: gnome-control-center-branding-upstream <= 12.3 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%glib2_gsettings_schema_requires +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description The control center is GNOME's main interface for configuration of @@ -193,57 +184,49 @@ GNOME control center. %prep %setup -q +%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -# SLE only patches 1000+ +# SLE-only patches 1000+ %if !0%{?is_opensuse} translation-update-upstream +%patch1000 -p1 +%patch1001 -p1 %patch1002 -p1 %patch1003 -p1 -%patch1004 -p1 -%patch1005 -p1 %endif %build -ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh - -%configure \ - --disable-static \ - --disable-maintainer-mode \ -%if %{with_ibus} - --enable-ibus \ -%else - --ibus-disable \ -%endif +export ACLOCAL_FLAGS="-I libgd" +%meson \ + -Dcheese=true \ + -Ddocumentation=true \ + %{!?with_ibus: -Dibus=false} \ %{nil} -pushd panels/common -make gsd-common-enums.h -popd -make %{?_smp_mflags} +%meson_build %install -%make_install +%meson_install find %{buildroot} -type f -name "*.la" -delete -print - -# We do not package gnome-control-center.rules (bnc#804966) -rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %find_lang %{name}-2.0 %{?no_lang_C} %find_lang %{name}-2.0-timezones %{name}-2.0.lang %fdupes %{buildroot}/%{_prefix} +# We do not package gnome-control-center.rules (bnc#804966) +rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules + %files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc NEWS README %{_bindir}/* -%{_datadir}/appdata/gnome-control-center.appdata.xml +%{_datadir}/metainfo/gnome-control-center.appdata.xml %exclude %{_datadir}/applications/gnome-color-panel.desktop %exclude %{_datadir}/applications/gnome-online-accounts-panel.desktop %{_datadir}/applications/*.desktop %{_datadir}/bash-completion/completions/gnome-control-center %{_datadir}/dbus-1/services/org.gnome.ControlCenter.service %{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service +%{_datadir}/glib-2.0/schemas/org.gnome.ControlCenter.gschema.xml %{_datadir}/gnome-control-center/ %dir %{_datadir}/gnome-shell/ %dir %{_datadir}/gnome-shell/search-providers/ @@ -261,27 +244,25 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %{_datadir}/sounds/gnome/default/alerts/*.ogg %{_libexecdir}/cc-remote-login-helper %{_libexecdir}/gnome-control-center-search-provider - %{_mandir}/man1/gnome-control-center.1%{?ext_man} -%files lang -f %{name}-2.0.lang - %files user-faces -%defattr (-, root, root) %{_datadir}/pixmaps/faces/ %files color -%defattr(-,root,root) %{_datadir}/applications/gnome-color-panel.desktop %files goa -%defattr(-,root,root) %{_datadir}/applications/gnome-online-accounts-panel.desktop %files devel -%defattr (-, root, root) +%doc AUTHORS ChangeLog MAINTAINERS gnome-control-center.doap %{_datadir}/pkgconfig/gnome-keybindings.pc %{_datadir}/gettext/its/gnome-keybindings.its %{_datadir}/gettext/its/gnome-keybindings.loc +%{_datadir}/gettext/its/sounds.its +%{_datadir}/gettext/its/sounds.loc + +%files lang -f %{name}-2.0.lang %changelog