Accepting request 159240 from GNOME:Next

Resubmit, with g-c-c-allow-yast rebased

OBS-URL: https://build.opensuse.org/request/show/159240
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=178
This commit is contained in:
Dominique Leuenberger 2013-03-13 22:38:52 +00:00 committed by Git OBS Bridge
parent 779700bf97
commit d3f31ae0b0
11 changed files with 576 additions and 103 deletions

View File

@ -0,0 +1,12 @@
diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
index 5b0028d..9078008 100644
--- a/panels/online-accounts/cc-online-accounts-panel.c
+++ b/panels/online-accounts/cc-online-accounts-panel.c
@@ -35,6 +35,7 @@
#include "cc-online-accounts-add-account-dialog.h"
#include "cc-online-accounts-model.h"
+#include "cc-online-accounts-resources.h"
typedef struct _CcGoaPanelClass CcGoaPanelClass;

View File

@ -16,11 +16,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187
panels/network/network-dialogs.c | 16 ++++++++ panels/network/network-dialogs.c | 16 ++++++++
4 files changed, 91 insertions(+), 2 deletions(-) 4 files changed, 91 insertions(+), 2 deletions(-)
Index: gnome-control-center-3.6.1/configure.ac Index: gnome-control-center-3.7.1/configure.ac
=================================================================== ===================================================================
--- gnome-control-center-3.6.1.orig/configure.ac --- gnome-control-center-3.7.1.orig/configure.ac
+++ gnome-control-center-3.6.1/configure.ac +++ gnome-control-center-3.7.1/configure.ac
@@ -136,7 +136,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO @@ -125,7 +125,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO
PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
@ -30,10 +30,10 @@ Index: gnome-control-center-3.6.1/configure.ac
PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
gnome-settings-daemon >= $GSD_REQUIRED_VERSION) gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.c Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.c
=================================================================== ===================================================================
--- gnome-control-center-3.6.1.orig/panels/network/cc-network-panel.c --- gnome-control-center-3.7.1.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.6.1/panels/network/cc-network-panel.c +++ gnome-control-center-3.7.1/panels/network/cc-network-panel.c
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <stdlib.h> #include <stdlib.h>
@ -43,7 +43,7 @@ Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.c
#include "cc-network-panel.h" #include "cc-network-panel.h"
#include "nm-remote-settings.h" #include "nm-remote-settings.h"
@@ -74,6 +76,9 @@ struct _CcNetworkPanelPrivate @@ -76,6 +78,9 @@ struct _CcNetworkPanelPrivate
gchar *arg_device; gchar *arg_device;
gchar *arg_access_point; gchar *arg_access_point;
gboolean operation_done; gboolean operation_done;
@ -53,7 +53,7 @@ Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.c
}; };
enum { enum {
@@ -1099,6 +1104,9 @@ cc_network_panel_init (CcNetworkPanel *p @@ -1182,6 +1187,9 @@ cc_network_panel_init (CcNetworkPanel *p
GtkTreeSelection *selection; GtkTreeSelection *selection;
GtkWidget *widget; GtkWidget *widget;
GtkWidget *toplevel; GtkWidget *toplevel;
@ -63,7 +63,7 @@ Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.c
panel->priv = NETWORK_PANEL_PRIVATE (panel); panel->priv = NETWORK_PANEL_PRIVATE (panel);
@@ -1185,6 +1193,28 @@ cc_network_panel_init (CcNetworkPanel *p @@ -1268,6 +1276,28 @@ cc_network_panel_init (CcNetworkPanel *p
/* add kill switch widgets when dialog activated */ /* add kill switch widgets when dialog activated */
panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel); panel->priv->add_header_widgets_idle = g_idle_add (network_add_shell_header_widgets_cb, panel);
@ -92,7 +92,7 @@ Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.c
} }
void void
@@ -1195,3 +1225,9 @@ cc_network_panel_register (GIOModule *mo @@ -1278,3 +1308,9 @@ cc_network_panel_register (GIOModule *mo
CC_TYPE_NETWORK_PANEL, CC_TYPE_NETWORK_PANEL,
"network", 0); "network", 0);
} }
@ -102,23 +102,23 @@ Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.c
+{ +{
+ return panel->priv->default_private; + return panel->priv->default_private;
+} +}
Index: gnome-control-center-3.6.1/panels/network/cc-network-panel.h Index: gnome-control-center-3.7.1/panels/network/cc-network-panel.h
=================================================================== ===================================================================
--- gnome-control-center-3.6.1.orig/panels/network/cc-network-panel.h --- gnome-control-center-3.7.1.orig/panels/network/cc-network-panel.h
+++ gnome-control-center-3.6.1/panels/network/cc-network-panel.h +++ gnome-control-center-3.7.1/panels/network/cc-network-panel.h
@@ -67,6 +67,8 @@ GType cc_network_panel_get_type (void) G @@ -69,6 +69,8 @@ void cc_network_panel_register (GIOModu
void cc_network_panel_register (GIOModule *module); GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel);
+gboolean cc_network_panel_get_default_private (CcNetworkPanel *panel); +gboolean cc_network_panel_get_default_private (CcNetworkPanel *panel);
+ +
G_END_DECLS G_END_DECLS
#endif /* _CC_NETWORK_PANEL_H */ #endif /* _CC_NETWORK_PANEL_H */
Index: gnome-control-center-3.6.1/panels/network/network-dialogs.c Index: gnome-control-center-3.7.1/panels/network/network-dialogs.c
=================================================================== ===================================================================
--- gnome-control-center-3.6.1.orig/panels/network/network-dialogs.c --- gnome-control-center-3.7.1.orig/panels/network/network-dialogs.c
+++ gnome-control-center-3.6.1/panels/network/network-dialogs.c +++ gnome-control-center-3.7.1/panels/network/network-dialogs.c
@@ -42,6 +42,7 @@ typedef struct { @@ -42,6 +42,7 @@ typedef struct {
NMClient *client; NMClient *client;
NMRemoteSettings *settings; NMRemoteSettings *settings;
@ -184,10 +184,10 @@ Index: gnome-control-center-3.6.1/panels/network/network-dialogs.c
caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device)); caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) { if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
Index: gnome-control-center-3.6.1/panels/network/net-device-wifi.c Index: gnome-control-center-3.7.1/panels/network/net-device-wifi.c
=================================================================== ===================================================================
--- gnome-control-center-3.6.1.orig/panels/network/net-device-wifi.c --- gnome-control-center-3.7.1.orig/panels/network/net-device-wifi.c
+++ gnome-control-center-3.6.1/panels/network/net-device-wifi.c +++ gnome-control-center-3.7.1/panels/network/net-device-wifi.c
@@ -1082,6 +1082,9 @@ wireless_try_to_connect (NetDeviceWifi * @@ -1082,6 +1082,9 @@ wireless_try_to_connect (NetDeviceWifi *
NMSettingWireless *setting_wireless; NMSettingWireless *setting_wireless;
NMRemoteSettings *remote_settings; NMRemoteSettings *remote_settings;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb
size 4877812

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48464b3c28139956449d6ae6ae6c726c33918b10a24b87ca193eda860dddc8b0
size 6689184

View File

@ -1,8 +1,8 @@
Index: gnome-control-center-3.5.90/shell/gnome-control-center.c Index: gnome-control-center-3.7.91/shell/cc-window.c
=================================================================== ===================================================================
--- gnome-control-center-3.5.90.orig/shell/gnome-control-center.c --- gnome-control-center-3.7.91.orig/shell/cc-window.c
+++ gnome-control-center-3.5.90/shell/gnome-control-center.c +++ gnome-control-center-3.7.91/shell/cc-window.c
@@ -172,6 +172,39 @@ get_icon_name_from_g_icon (GIcon *gicon) @@ -133,6 +133,39 @@ get_icon_name_from_g_icon (GIcon *gicon)
return NULL; return NULL;
} }
@ -40,18 +40,45 @@ Index: gnome-control-center-3.5.90/shell/gnome-control-center.c
+} +}
+ +
static gboolean static gboolean
activate_panel (GnomeControlCenter *shell, activate_panel (CcWindow *self,
const gchar *id, const gchar *id,
@@ -195,6 +228,12 @@ activate_panel (GnomeControlCenter *shel @@ -147,6 +180,11 @@ activate_panel (CcWindow *self
if (!id) if (!id)
return FALSE; return FALSE;
+ if (g_strcmp0 (id, "YaST.desktop") == 0) + if (g_strcmp0 (id, "yast") == 0) {
+ { + suse_activate_desktop (shell, id, "YaST.desktop");
+ suse_activate_desktop (shell, id, desktop_file); + return TRUE;
+ return TRUE; + }
+ }
+ +
for (l = panels; l != NULL; l = l->next) priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, argv));
{ cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel));
GIOExtension *extension; gtk_widget_show (priv->current_panel);
Index: gnome-control-center-3.7.91/shell/cc-panel-loader.c
===================================================================
--- gnome-control-center-3.7.91.orig/shell/cc-panel-loader.c
+++ gnome-control-center-3.7.91/shell/cc-panel-loader.c
@@ -178,6 +178,23 @@ cc_panel_loader_fill_model (CcShellModel
cc_shell_model_add_item (model, category, G_APP_INFO (app), all_panels[i].name);
g_object_unref (app);
}
+
+ do
+ {
+ GDesktopAppInfo *app;
+
+ app = g_desktop_app_info_new ("YaST.desktop");
+
+ if (app == NULL)
+ {
+ g_warning ("Missing desktop file for YaST");
+ continue;
+ }
+
+ cc_shell_model_add_item (model, CC_CATEGORY_SYSTEM, G_APP_INFO (app), "yast");
+ g_object_unref (app);
+ }
+ while (0);
}
#ifndef CC_PANEL_LOADER_NO_GTYPES

View File

@ -0,0 +1,44 @@
From 38a7a3fbe6cd5dba7cfd7ad706d03cccaa05823a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 26 Oct 2012 10:27:32 -0400
Subject: [PATCH] network: Fix the build with nma 0.9.6.2
This is a temporary bandaid until 0.9.6.4 is released.
---
panels/network/network-dialogs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c
index f9be79d..e6b0774 100644
--- a/panels/network/network-dialogs.c
+++ b/panels/network/network-dialogs.c
@@ -30,7 +30,7 @@
#include <nm-device-wifi.h>
#include "network-dialogs.h"
-#include "nm-wifi-dialog.h"
+#include "nm-wireless-dialog.h"
#include "nm-mobile-wizard.h"
typedef struct {
@@ -108,7 +108,7 @@ nag_dialog_response_cb (GtkDialog *nag_dialog,
gint response,
gpointer user_data)
{
- NMAWifiDialog *wireless_dialog = NMA_WIFI_DIALOG (user_data);
+ NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data);
if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */
nma_wifi_dialog_set_nag_ignored (wireless_dialog, TRUE);
@@ -121,7 +121,7 @@ wireless_dialog_response_cb (GtkDialog *foo,
gint response,
gpointer user_data)
{
- NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo);
+ NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo);
WirelessDialogClosure *closure = user_data;
NMConnection *connection, *fuzzy_match = NULL;
NMDevice *device;
--
1.7.12.1

View File

@ -15,11 +15,11 @@ Date: Mon Mar 12 15:31:40 2012 +0100
https://bugzilla.gnome.org/show_bug.cgi?id=646185 https://bugzilla.gnome.org/show_bug.cgi?id=646185
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c Index: gnome-control-center-3.7.3/panels/datetime/cc-datetime-panel.c
index d229e94..378e0cb 100644 ===================================================================
--- a/panels/datetime/cc-datetime-panel.c --- gnome-control-center-3.7.3.orig/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c +++ gnome-control-center-3.7.3/panels/datetime/cc-datetime-panel.c
@@ -86,6 +86,7 @@ struct _CcDateTimePanelPrivate @@ -88,6 +88,7 @@ struct _CcDateTimePanelPrivate
GCancellable *cancellable; GCancellable *cancellable;
GPermission *permission; GPermission *permission;
@ -27,7 +27,7 @@ index d229e94..378e0cb 100644
}; };
static void update_time (CcDateTimePanel *self); static void update_time (CcDateTimePanel *self);
@@ -164,6 +165,12 @@ cc_date_time_panel_dispose (GObject *object) @@ -166,6 +167,12 @@ cc_date_time_panel_dispose (GObject *obj
priv->permission = NULL; priv->permission = NULL;
} }
@ -40,7 +40,7 @@ index d229e94..378e0cb 100644
G_OBJECT_CLASS (cc_date_time_panel_parent_class)->dispose (object); G_OBJECT_CLASS (cc_date_time_panel_parent_class)->dispose (object);
} }
@@ -806,19 +813,33 @@ on_permission_changed (GPermission *permission, @@ -818,19 +825,33 @@ on_permission_changed (GPermission *perm
gpointer data) gpointer data)
{ {
CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv; CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv;
@ -76,7 +76,7 @@ index d229e94..378e0cb 100644
update_ntp_switch_from_system (CcDateTimePanel *self) update_ntp_switch_from_system (CcDateTimePanel *self)
{ {
CcDateTimePanelPrivate *priv = self->priv; CcDateTimePanelPrivate *priv = self->priv;
@@ -1103,6 +1124,18 @@ cc_date_time_panel_init (CcDateTimePanel *self) @@ -1134,4 +1155,16 @@ cc_date_time_panel_init (CcDateTimePanel
g_signal_connect (priv->permission, "notify", g_signal_connect (priv->permission, "notify",
G_CALLBACK (on_permission_changed), self); G_CALLBACK (on_permission_changed), self);
on_permission_changed (priv->permission, NULL, self); on_permission_changed (priv->permission, NULL, self);
@ -93,5 +93,3 @@ index d229e94..378e0cb 100644
+ G_CALLBACK (on_permission_tz_changed), self); + G_CALLBACK (on_permission_tz_changed), self);
+ on_permission_tz_changed (priv->permission_tz, NULL, self); + on_permission_tz_changed (priv->permission_tz, NULL, self);
} }
void

View File

@ -0,0 +1,41 @@
From 840b6826be4299a405259d16593f0e6860d8fd94 Mon Sep 17 00:00:00 2001
From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 28 Feb 2013 22:25:37 +0000
Subject: Fix gcc warnings
---
(limited to 'libgd/gd-header-bar.c')
diff --git a/libgd/gd-header-bar.c b/libgd/gd-header-bar.c
index c362ded..0d5fcec 100644
--- a/libgd/gd-header-bar.c
+++ b/libgd/gd-header-bar.c
@@ -19,6 +19,8 @@
#include "gd-header-bar.h"
+#include <string.h>
+
/* TODO
* - wm communication
*/
@@ -159,7 +161,6 @@ gd_header_bar_get_size (GtkWidget *widget,
GList *l;
gint nvis_children;
gint minimum, natural;
- gint padding;
GtkBorder css_borders;
minimum = natural = 0;
@@ -493,7 +494,7 @@ gd_header_bar_size_allocate (GtkWidget *widget,
i = nvis_children - 1;
}
- for (l; l != NULL; (packing == GTK_PACK_START) ? (l = l->next) : (l = l->prev))
+ for (; l != NULL; (packing == GTK_PACK_START) ? (l = l->next) : (l = l->prev))
{
child = l->data;
if (!gtk_widget_get_visible (child->widget))
--
cgit v0.9.1

View File

@ -0,0 +1,12 @@
Index: gnome-control-center-3.7.90/panels/network/network-dialogs.c
===================================================================
--- gnome-control-center-3.7.90.orig/panels/network/network-dialogs.c
+++ gnome-control-center-3.7.90/panels/network/network-dialogs.c
@@ -29,6 +29,7 @@
#include <nm-device-wifi.h>
#include "network-dialogs.h"
+#include "nm-wifi-dialog.h"
#include "nm-wireless-dialog.h"
#include "nm-mobile-wizard.h"

View File

@ -1,3 +1,341 @@
-------------------------------------------------------------------
Wed Mar 13 21:55:09 UTC 2013 - dimstar@opensuse.org
- Rebase gnome-control-center-allow-yast-in-shell.patch and
reenable the patch.
-------------------------------------------------------------------
Tue Mar 5 14:52:01 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.91:
+ Fix titlebar bug.
+ Use the new GdStack widget to switch panels.
+ Don't prelight icons in the icon view.
+ Make search be "and" instead of "or" by default.
+ Make it possible to look for multiple keywords in the search.
+ Background:
- Monitor the Pictures and the cache directory for new files.
+ Online accounts:
- Nicer error states.
- Add a new "Other" providers page.
+ Printers:
- Don't crash after changing an option.
+ Region & Language:
- Center the text in the language and format choosers.
+ Search:
- Fix folder names in non-ASCII languages.
+ Search provider:
- Escape the description passed to gnome-shell.
+ Sharing:
- Check if SSH is available before showing it in the UI.
+ User accounts:
- Make login history dialog title translatable.
- Add gnome-control-center-libgd.patch: Fix brp error for implicit
declaration of strcmp.
-------------------------------------------------------------------
Tue Feb 26 23:59:59 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.90:
+ Use header bar to show the current panel's name.
+ Add sound and user-accounts panels to the command-line
completion, and ensure the completion is sorted by default.
+ Update man page.
+ Do not forcibly suppress debug messages if --verbose not set.
+ Add GNOME Shell search provider and remove unused menu
definition.
+ Update descriptions for all the panels.
+ Use a back arrow in the header bar, and go back to the previous
panel if navigated from one.
+ Color:
- Bump the required colord version.
- Don't stretch the device switch.
- Add widget relations for accessibility, and make all buttons
keyboard accessible.
- When calibrating inhibit logout, switching users and
suspending.
- Expand profiles assigned to the device when single clicked.
+ Details:
- Remove fallback from keywords.
+ Keyboard:
- Be more specific in input source switch label.
+ Network:
- Require newly released NetworkManager 0.9.8.
- Disable the Hotspot button if the device does not support it.
- Add support for newer versions of ModemManager.
- Try to guess the operator name for WWAN connections.
- Fix warnings when virtual connections exist.
- Display "device state reason" to show, eg., locked modems.
- Fix some alignment, spacing problems.
- Make symbolic icons sharper.
- Add widget relations for accessibility.
- Avoid all access points being named after the shared
connection in some cases.
- Fix connection editor's apply button not working.
- Plug some memory leaks.
+ Notifications:
- Fix some spacing problems.
+ Mouse:
- Fix possible bad state when reopening the mouse panel.
+ Online Accounts:
- Don't use GOA specific warning macro.
+ Power:
- Update idle time and suspend idle time ranges.
- Fix layout of the automatic suspend dialogue.
- Better label for the idle-delay selection.
- Add widget relations for accessibility.
+ Printers:
- Visual improvements of driver selection dialog.
- Search for samba printers in new printer dialog.
- Add authentication dialog for samba printers.
- Disable building the printers panel if libsmbclient isn't
available.
+ Privacy:
- Clarify "Lock Screen After" string.
- Remove redundant option from the recent files combobox.
+ Region & Language:
- Update design based.
+ Search:
- Don't make the settings search configurable.
+ Sharing:
- Start or stop Rygel when Media Sharing is enabled or disabled
- Add a master switch to disable all the services.
+ Sound:
- Show a different icon for different input/output ports.
+ User Accounts:
- Add widget relations for accessibility.
- Don't reject passwords that pwquality says are ok.
- Remove password hints feature from the UI as they are not
implemented in GDM.
- Add pkgconfig(mm-glib) and pkgconfig(smbclient) BuildRequires:
new dependencies for the network panel and printer panel.
- Add pkgconfig(gobject-introspection-1.0) BuildRequires:
dependency for egg-list-box.
- Build the new submodule egg-list-box.
- Add gnome-control-center-nma-nialog.patch: Fix some missing
includes. A more complete patch, taking care of removing
deprecates is already pushed upstream.
-------------------------------------------------------------------
Tue Feb 26 23:50:00 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.5.1:
+ Color:
- Make medium quality the default.
+ Network
- Allow compiling against NetworkManager 0.9.6.
- Disable 'Apply' until things have changed.
- Use symbolic icons consistently.
-------------------------------------------------------------------
Tue Feb 26 23:40:00 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.5:
+ Background:
- Sort Pictures in order of most recently modified.
- Update for gnome-shell Screenshot API changes.
+ Color:
- Allow the user to remove automatically added profiles.
- Show a summary page when running on a LiveCD.
- Show sRGB and AdobeRGB profiles when selecting a profile for
a display.
- Use a EggListBox for the main device display to match the new
mockups.
- Use colord-session to calibrate the display.
+ Display:
- Add support for 21:9 displays.
+ Network:
- Add a spinner while connecting.
- Add integrated "Add New Connection".
- Add VPN support to the connection editor.
- Support new AP-mode hotspot functionality.
+ Power:
- Add a dim screen switch.
- Add idle-delay configuration.
+ Printers:
- Attach toolbar controlling jobs to list of jobs.
+ Screen:
- Remove screen panel.
+ Sharing:
- Add a "show password" check button to the screen sharing
dialog.
- Don't show Media sharing without rygel.
- Hide Bluetooth sharing when there is no Bluetooth adapter.
+ Shell:
- Activate items on single click.
- Add pkgconfig(colord-gtk) and pkgconfig(libnm-glib-vpn)
BuildRequires: new dependencies.
- Add pkgconfig(gio-2.0), pkgconfig(gl) and pkgconfig(gmodule-2.0)
BuildRequires: new verified dependencies.
- Drop pkgconfig(iso-codes) BuildRequires: no longer needed.
- Drop g-c-c-online-accounts.patch: fixed upstream.
-------------------------------------------------------------------
Tue Feb 26 23:30:00 UTC 2013 - vuntz@opensuse.org
- Rebase gnome-control-center-allow-yast-in-shell.patch to work
with the new code.
-------------------------------------------------------------------
Tue Feb 26 23:20:00 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.4:
+ Add new Sharing panel.
+ Add bash completion file.
+ Use GResources to handle UI files.
+ Color:
- Only show the calibrate or add buttons when the device is
selected
- Don't crash if no sensors are plugged in
+ Details:
- Remove Graphics section
+ Keyboard:
- Allow key repeat rate of 110 chars/sec
- Add input-source-switcher to the shortcuts
+ Power:
- Implement the new Power panel design
+ Printers:
- Control acceptance of jobs with enable switch
+ Region & Language:
- Add per-window input sources setting
+ Shell:
- Make scrollbars reach to the edge of the window
- Don't search in .desktop file descriptions
- Remove prelight from search results
- Make search results descriptions dimmer
- Fix keyboard navigation in the search results and the main
view
- Add --search and --list command-line options
- Add support for the back mouse button
+ User Accounts:
- Port to use libaccountsservice (and drop the systemd direct
dependency)
- Fix crash when built with cheese support
- Handle the real name not being set
- Add login history dialogue
- Add pkgconfig(accountsservice) BuildRequires: new dependency for
the user accounts panel.
- Add g-c-c-online-accounts.patch: fix implicit declaration in
online-accounts panel.
-------------------------------------------------------------------
Tue Feb 26 23:10:00 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.3:
+ Remove fallback session handling code
+ Add search panel
+ Add privacy panel
+ Add notifications panel
+ Use the proper Unicode ellipsis (…) instead of three dots
+ Background:
- Hide in Unity
- Fix not having 3 columns in high contrast
+ Bluetooth:
- Avoid possible loops when Connection fails
- Fix main switch acting bizarrely
- Use spinner when connecting
- Align the device list with the all settings button
- Remove ObexFTP browsing from the UI
+ Color:
- Do not use a combobox when listing profiles to add to devices
+ Date & Time:
- Do not offer the 12 hr clock in locales without AM/PM
+ Details:
- Add distro information
- Add CPU model on ARM
- Avoid adding phantom "Unknown model" CPU on PPC64
+ Info:
- Set the hostname only after a small delay
+ Keyboard:
- Point to a more specific help page
- Add support for msgctxt in keybindings
- Improve shortcuts tab keynav
+ Network:
- Make sure flight mode is always visible
- Make sure Airplane mode switch everything off
- Ensure IMEI is displayed and reload Operator Name when it changes
- Also load IMEI and Operator Name for LTE-only modems
+ Online accounts:
- Don't preselect the first item when adding an account
- Align the accounts list with the all settings button
- Only allow adding accounts if the network is available
+ Printers:
- Show in Unity
- Fix problems when adding new printers
+ Region:
- Show in Unity
- Fix possible crasher on startup when the X11Variant are empty
- Offer logout options after changing language
- Add Japanese to the popular languages
- Show popular languages in their own language
- Fix other user's languages never getting added
- Make 'Add' dialogs consistent
- Reinstate the separator in the languages list
- Fix button alignment problem
+ Shell:
- Remove the previous panel when switching to a new one
- Don't remove old panel if new one is broken
- Add F1 shortcut to show the help
- Rename to Settings
- Ensure the home button is the correct height
- Fix alignment of home button in RTL languages
- Make all the plugins static
+ Sound:
- Clarify "sound events"
- Fix possible crasher
- Use libgnome-volume-control
+ Universal Access:
- Set the dialog hint on the zoom options
- Also set the WM HighContrast theme when the switch is flipped
+ Users:
- Rename from User Accounts
- Show the password by default once generated
- Fix resetting one's avatar
- Add "last login" field
+ Wacom:
- Add support for the new OSD help display
- Rebase gnome-control-center-allow-yast-in-shell.patch.
-------------------------------------------------------------------
Tue Feb 26 23:00:00 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.1:
+ All:
- Improve contexts for ambiguous strings.
+ Background:
- Optimise preview for the usual shell layout.
- Handle copy cancellation correctly.
- Fix crash when exiting panel too quickly.
+ Keyboard:
- Ensure the dir name shown matches the XDG Pictures dir.
+ Network:
- Rename "Wireless" to "Wi-Fi" in the UI.
- Add more keywords to the desktop file.
- Fix 8021x connections.
- Add an 'Ignore Hosts' entry to the proxy page.
- Minimal support for unrecognized device types.
- Add support for showing bond slaves.
+ Mouse:
- Don't show touchpad disable button when there's no mouse.
+ Screen:
- Handle brightness calls finishing after we're done.
+ Info:
- Don't block for PackageKit.
- Detect and display Virtualisation method used.
+ User Accounts:
- Remove the autologin checkmark.
- Logged in status identification.
- Complete discover on failure.
- Remove the realmd version check.
- Recognize that some kerberos domains cannot be joined.
- Set timeouts on all realmd interface proxies.
- Don't have domains twice in the drop down.
- Require logind for session tracking.
- fix wrong sensitivity of the autologin combo.
- Rebase gcc-private-connection.patch.
- Add gnome-control-center-build.patch: Fix build with
NetworkManager stable branch.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 26 20:23:09 UTC 2013 - dimstar@opensuse.org Tue Feb 26 20:23:09 UTC 2013 - dimstar@opensuse.org
@ -17,7 +355,7 @@ Thu Dec 27 17:46:07 UTC 2012 - mike.catanzaro@gmail.com
- Drop apg recommends: automatic password generatoion is no longer - Drop apg recommends: automatic password generatoion is no longer
done by spawning apg, but rather by using libpwquality directly. done by spawning apg, but rather by using libpwquality directly.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 15 11:11:27 UTC 2012 - dimstar@opensuse.org Thu Nov 15 11:11:27 UTC 2012 - dimstar@opensuse.org

View File

@ -24,24 +24,29 @@
%define with_ibus 0 %define with_ibus 0
Name: gnome-control-center Name: gnome-control-center
Version: 3.6.3 Version: 3.7.91
Release: 0 Release: 0
# FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
Summary: The GNOME Control Center Summary: The GNOME Control Center
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://www.gnome.org Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-control-center/3.6/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-control-center/3.7/%{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast...
Patch0: gnome-control-center-allow-yast-in-shell.patch Patch0: gnome-control-center-allow-yast-in-shell.patch
# PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vuntz@opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833) # PATCH-NEEDS-REBASE PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vuntz@opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833)
Patch2: gnome-control-center-hide-region-system-tab.patch Patch2: gnome-control-center-hide-region-system-tab.patch
# PATCH-FIX-UPSTREAM gnome-control-center-fine-grained-tz-polkit.patch bgo#646185 bnc#749453 vuntz@opensuse.org -- Allow changing timezone without requiring privileges to change time # PATCH-FIX-UPSTREAM gnome-control-center-fine-grained-tz-polkit.patch bgo#646185 bnc#749453 vuntz@opensuse.org -- Allow changing timezone without requiring privileges to change time
Patch3: gnome-control-center-fine-grained-tz-polkit.patch Patch3: gnome-control-center-fine-grained-tz-polkit.patch
# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE)
Patch14: gnome-control-center-system-proxy-configuration.patch Patch14: gnome-control-center-system-proxy-configuration.patch
# PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized # PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized
Patch15: gcc-private-connection.patch Patch15: gcc-private-connection.patch
# PATCH-FIX-UPSTREAM gnome-control-center-build.patch dimstar@opensuse.org -- Fix build with stable NM branch. Patch from distributors mailinglist.
Patch17: gnome-control-center-build.patch
# PATCH-FIX-UPSTREAM gnome-control-center-nma-nialog.patch dimstar@opensuse.org -- Fix includes. More complete rewrite already in git.
Patch18: gnome-control-center-nma-nialog.patch
Patch19: gnome-control-center-libgd.patch
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -50,47 +55,54 @@ BuildRequires: intltool
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(accountsservice) >= 0.6.30
BuildRequires: pkgconfig(cheese) BuildRequires: pkgconfig(cheese)
BuildRequires: pkgconfig(cheese-gtk) >= 3.3.91 BuildRequires: pkgconfig(cheese-gtk) >= 3.3.91
BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(clutter-gtk-1.0)
BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(colord) >= 0.1.29
BuildRequires: pkgconfig(colord-gtk) >= 0.1.24
BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0) >= 2.35.1
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.5.5 BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.5.5
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.5.91 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.7.5
BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.6.0 BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.7.3
BuildRequires: pkgconfig(goa-1.0) >= 3.5.90 BuildRequires: pkgconfig(goa-1.0) >= 3.5.90
BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91 BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.7.2.2
BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.13 BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.7
%if %{with_ibus} %if %{with_ibus}
BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99 BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99
%endif %endif
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgnome-menu-3.0) BuildRequires: pkgconfig(libgnome-menu-3.0)
BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libnm-glib) >= 0.8.992 BuildRequires: pkgconfig(libnm-glib) >= 0.9.8
BuildRequires: pkgconfig(libnm-gtk) >= 0.8.992 BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.8
BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8
BuildRequires: pkgconfig(libnotify) >= 0.7.3 BuildRequires: pkgconfig(libnotify) >= 0.7.3
BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0
%if %{with_systemd} %if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-login) BuildRequires: pkgconfig(libsystemd-login)
%endif %endif
BuildRequires: pkgconfig(libwacom) >= 0.6 BuildRequires: pkgconfig(libwacom) >= 0.7
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mm-glib)
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
BuildRequires: pkgconfig(pwquality) BuildRequires: pkgconfig(pwquality)
BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xft)
BuildRequires: pkgconfig(xi) >= 1.2 BuildRequires: pkgconfig(xi) >= 1.2
Requires: %{name}-branding = %{version}
# needed for glxinfo, used by System info panel # needed for glxinfo, used by System info panel
Requires: Mesa-demo-x Requires: Mesa-demo-x
# needed for printers panel # needed for printers panel
@ -121,24 +133,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
The control center is GNOME's main interface for configuration of The control center is GNOME's main interface for configuration of
various aspects of your desktop. various aspects of your desktop.
%package branding-upstream
Summary: The GNOME Control Center -- Upstream Definition of Shell Content
Group: System/GUI/GNOME
Requires: %{name} = %{version}
Supplements: packageand(%{name}:branding-upstream)
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
BuildArch: noarch
#BRAND: This package contains the definitions of the content appearing
#BRAND: in the shell (/etc/xdg/menus/gnomecc.menu).
%description branding-upstream
The control center is GNOME's main interface for configuration of
various aspects of your desktop.
This package provides the upstream definition of what appears in the
control center.
%package user-faces %package user-faces
Summary: Login Managers user avatars Summary: Login Managers user avatars
Group: System/GUI/GNOME Group: System/GUI/GNOME
@ -162,19 +156,27 @@ various aspects of your desktop.
%setup -q %setup -q
translation-update-upstream translation-update-upstream
%patch0 -p1 %patch0 -p1
%patch2 -p1 #Needs rebase
#patch2 -p1
%patch3 -p1 %patch3 -p1
#NEEDS-REBASE #NEEDS-REBASE
#%patch14 -p1 #patch14 -p1
%patch15 -p1 #patch15 -p1
%patch17 -p1
%if 0%{?BUILD_FROM_VCS} %patch18 -p1
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh (cd libgd
%else %patch19 -p1
NOCONFIGURE=1 gnome-autogen.sh )
%endif
%build %build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
# Build egg-list-box
pushd egg-list-box
%configure
make %{?_smp_mflags}
popd
%configure --with-pic\ %configure --with-pic\
%if %{with_systemd} %if %{with_systemd}
--enable-systemd\ --enable-systemd\
@ -197,7 +199,6 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%find_lang %{name}-2.0 %{?no_lang_C} %find_lang %{name}-2.0 %{?no_lang_C}
%find_lang %{name}-2.0-timezones %{name}-2.0.lang %find_lang %{name}-2.0-timezones %{name}-2.0.lang
%suse_update_desktop_file gnome-control-center %suse_update_desktop_file gnome-control-center
%suse_update_desktop_file gnome-sound-applet
# capplets # capplets
%suse_update_desktop_file gnome-background-panel X-SuSE-ControlCenter-LookAndFeel %suse_update_desktop_file gnome-background-panel X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file gnome-color-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-color-panel X-SuSE-ControlCenter-Hardware
@ -206,12 +207,10 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%suse_update_desktop_file gnome-info-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-info-panel X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-keyboard-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-keyboard-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-mouse-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-mouse-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-network-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-online-accounts-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-online-accounts-panel X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-power-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-power-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-printers-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-printers-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-region-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-region-panel X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-screen-panel X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file gnome-sound-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-sound-panel X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-universal-access-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-universal-access-panel X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-user-accounts-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-user-accounts-panel X-SuSE-ControlCenter-Personal
@ -233,16 +232,19 @@ rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO %doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/* %{_bindir}/*
%{_sysconfdir}/xdg/autostart/*.desktop
%{_libdir}/control-center-1/
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/desktop-directories/*.directory %{_datadir}/bash-completion/completions/gnome-control-center
%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
%{_datadir}/gnome-control-center/ %{_datadir}/gnome-control-center/
%dir %{_datadir}/gnome-shell/
%dir %{_datadir}/gnome-shell/search-providers/
%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini
%{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/*/*/*.svg %{_datadir}/icons/hicolor/*/*/*.svg
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy %{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
# We do not package gnome-control-center.rules # We do not package gnome-control-center.rules
#{_datadir}/polkit-1/rules.d/gnome-control-center.rules #{_datadir}/polkit-1/rules.d/gnome-control-center.rules
@ -250,11 +252,10 @@ rm -rf %{buildroot}
%dir %{_datadir}/sounds/gnome/default %dir %{_datadir}/sounds/gnome/default
%dir %{_datadir}/sounds/gnome/default/alerts %dir %{_datadir}/sounds/gnome/default/alerts
%{_datadir}/sounds/gnome/default/alerts/*.ogg %{_datadir}/sounds/gnome/default/alerts/*.ogg
%{_mandir}/man1/gnome-control-center.1%{?ext_man} %{_libexecdir}/cc-remote-login-helper
%{_libexecdir}/gnome-control-center-search-provider
%files branding-upstream %{_mandir}/man1/gnome-control-center.1%{?ext_man}
%defattr (-, root, root)
%{_sysconfdir}/xdg/menus/gnomecc.menu
%files lang -f %{name}-2.0.lang %files lang -f %{name}-2.0.lang