From 8ee1eb64ef324ae677f7fdd558f053ac6351221d018d552258bf42bbbc57fdda Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Nov 2011 08:23:48 +0000 Subject: [PATCH] Accepting request 93525 from home:dimstar:branches:GNOME:Factory Update to 3.3.2 OBS-URL: https://build.opensuse.org/request/show/93525 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=126 --- gnome-control-center-3.2.2.tar.bz2 | 3 - gnome-control-center-3.3.2.tar.bz2 | 3 + gnome-control-center-shell-no-crash.patch | 33 ------- gnome-control-center.changes | 103 ++++++++++++++++++++++ gnome-control-center.spec | 32 ++----- 5 files changed, 111 insertions(+), 63 deletions(-) delete mode 100644 gnome-control-center-3.2.2.tar.bz2 create mode 100644 gnome-control-center-3.3.2.tar.bz2 delete mode 100644 gnome-control-center-shell-no-crash.patch diff --git a/gnome-control-center-3.2.2.tar.bz2 b/gnome-control-center-3.2.2.tar.bz2 deleted file mode 100644 index e8fb662..0000000 --- a/gnome-control-center-3.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81797af279866094dd3281da1a5b852b9be1515473f9b11c095132f0a2b61b1d -size 4983619 diff --git a/gnome-control-center-3.3.2.tar.bz2 b/gnome-control-center-3.3.2.tar.bz2 new file mode 100644 index 0000000..18c39f7 --- /dev/null +++ b/gnome-control-center-3.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73cdf1821dbc34b1dcc98e542ace8dc77e754e0226a802d164f8ff5d40ae1b2b +size 4956727 diff --git a/gnome-control-center-shell-no-crash.patch b/gnome-control-center-shell-no-crash.patch deleted file mode 100644 index 8350945..0000000 --- a/gnome-control-center-shell-no-crash.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 59fe530504a4359f66d9a112050970a52fe46281 -Author: Vincent Untz -Date: Tue Oct 11 22:51:42 2011 +0200 - - shell: Avoid crash when searching if a .desktop has no comment - - The code doing the search assumes the description column is set, which - might not be the case. - - https://bugzilla.gnome.org/show_bug.cgi?id=661494 - -diff --git a/shell/shell-search-renderer.c b/shell/shell-search-renderer.c -index 0667bc0..6032af8 100644 ---- a/shell/shell-search-renderer.c -+++ b/shell/shell-search-renderer.c -@@ -154,12 +154,15 @@ shell_search_renderer_set_layout (ShellSearchRenderer *cell, GtkWidget *widget) - needle = g_utf8_casefold (priv->search_string, -1); - else - needle = NULL; -- haystack = g_utf8_casefold (full_string, -1); -+ if (full_string != NULL) -+ haystack = g_utf8_casefold (full_string, -1); -+ else -+ haystack = NULL; - - /* clear any previous attributes */ - pango_layout_set_attributes (priv->layout, NULL); - -- if (priv->search_string && priv->title -+ if (priv->search_string && priv->search_target && priv->title - && (strstr (haystack, needle))) - { - gchar *start; diff --git a/gnome-control-center.changes b/gnome-control-center.changes index e58cf75..a7a9e1b 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,106 @@ +------------------------------------------------------------------- +Tue Nov 22 11:33:05 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.2: + + Common: + - Do not install private libgnome-control-center (bgo#655287) + - Fix handling of (bgo#748444) + + Background: + - Added D'n'D support for adding wallpapers (bgo#655375) + - Force a toolbar style + + Bluetooth: + - Move Bluetooth panel from gnome-bluetooth + + Color: + - Update icon cache only on MAINTAINER_MODE + - Do not allow the 'Add profile' modal dialog to be resizable + - Improve the 'Add profile' modal dialog (bgo#661657) + - Don't show profile ages for EDID, test and colorspace + profiles (bgo#661669) + - Show 'Uncalibrated' when a device has a test profile assigned + - After removing a profile select the device so the UI is + correct (bgo#661658) + - Fix a critical warning in the new GtkTreeIter code + - Make toolbar buttons focusable (bgo#662430) + + Date & time: + - Fix showing actual clock format on panel open + + Info: + - Use x-content/unix-software as mime for the Software combobox + (bgo#660803) + - Add labelling relations + + Keyboard: + - Don't load duplicate keybindings + - Fix ATK descriptions (bgo#574073) + - Make the '+' button work all the time (bgo#662253) + - Remove broken allowed_keys checks + - Use GtkCellRendererAccel + - Adjust shortcut files (bgo#663626) + - Rename a11y keyboard shortcuts + - Remove support for conditional shortcuts (bgo#663431) + - Stop monitoring num-workspaces + - Port custom shortcuts to GSettings + + Mouse: + - Fix ATK descriptions + + Network: + - Allocate nm-connection for nma-wireless-dialog (bgo#648174) + - Show wireless dialog even if there is no active AP + (bgo#661526) + - Accessibility improvements + - Add proxy to the keywords (bgo#663340) + - Make tabbing through the proxy page work + + Online accounts: + - Add title for "Add Account" dialogue (bgo#661573) + + Power: + - Use the correct item in the combo boxes when + sleep-when-inactive is disabled + - Don't set the sleep-inactive-x GSettings keys that have been + removed + - Use "Power off" instead of "Shutdown" (bgo#661559) + + Printers: + - Check state of CUPS after start (bgo#659721) + - Fix build on systems without LC_PAPER (bgo#660692) + - Don't hide address entry + - Make +/- buttons insensitive when can not connect to CUPS + - Set requesting-user-name when getting job info + - Detect disconnection of printer + - Don't allow "/" in printer name (bgo#661774) + + Region: + - Hide system tab if no localed + - Simplify getting the current Locale + - Implement copying layouts (bgo#659300) + - Fix build on systems without LC_MEASUREMENT (bgo#660787) + - Align the example dates + - Only show locales for languages that have translations + - Always add English to the list, as it should always be + available + + Screen: + - Never set gnome-session's idle-delay to 1 + + Shell: + - Make sure we gtk_widget_show the search view + - Avoid crash when searching if a .desktop has no comment + (bgo#661494) + - Make Ctrl+Q work outside the overview + - Make Ctrl+W close panels (bgo#660814) + - Give focus to the search entry when showing the overview page + - Don't crash when loading the icon fails (bgo#660513) + - Use icon for "All Settings" button (bgo#657043) + - Add a11y label for the All Settings button + - Merge libgnome-control-center into main binary + + Sound: + - Fix possible infinite loop in combo box + - Add a minimum height for the output list (bgo#660582) + - Export sysfs path in stream properties + - Port audible-bell to GSettings (bgo#625899) + + Universal access: + - Fix ATK descriptions + - Avoid crashing when GConf is broken (bgo#751007) + - Update for metacity GSettings port (bgo#625899) + + User accounts: + - Make unlock icon in tooltip match reality + + Updated translations. +- Drop gnome-control-center-shell-no-crash.patch: fixed upstream. +- Drop libgnome-control-center1 subpackage. The private library is + no longer being installed. + ------------------------------------------------------------------- Tue Nov 15 10:40:15 UTC 2011 - vuntz@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index e8e2d61..a032878 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -36,11 +36,11 @@ BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.1.91 BuildRequires: pkgconfig(gnome-settings-daemon) >= 2.91.94 -BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0 BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.1.19 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.3 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgnomekbd) @@ -64,15 +64,13 @@ License: GPLv2+ Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme -Version: 3.2.2 +Version: 3.3.2 Release: 1 # FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center -Source: http://download.gnome.org/sources/gnome-control-center/3.2/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-control-center/3.3/%{name}-%{version}.tar.bz2 # 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 -# PATCH-FIX-UPSTREAM gnome-control-center-shell-no-crash.patch vuntz@opensuse.org -- Do not crash on search when a .desktop has no Comment -Patch1: gnome-control-center-shell-no-crash.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) Patch2: gnome-control-center-hide-region-system-tab.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) @@ -131,20 +129,11 @@ Group: System/GUI/GNOME %description user-faces This package provides user avatars to be used by display managers -%package -n libgnome-control-center1 -License: GPLv2+ -Summary: Shared library used by GNOME control center -Group: System/GUI/GNOME - -%description -n libgnome-control-center1 -Shared library used by GNOME control center - %package devel License: GPLv2+ Summary: Header files for the GNOME Control Center Group: Development/Libraries/GNOME Requires: %{name} = %{version} -Requires: libgnome-control-center1 = %{version} Provides: control-center2-devel = 2.22.1 Obsoletes: control-center2-devel < 2.22.1 @@ -157,7 +146,6 @@ various aspects of your desktop. %setup -q translation-update-upstream %patch0 -p1 -%patch1 -p1 %patch2 -p1 #NEEDS-REBASE #%patch14 -p1 @@ -193,7 +181,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file gnome-display-panel X-SuSE-ControlCenter-Hardware %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-media-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 @@ -220,10 +207,6 @@ rm -rf $RPM_BUILD_ROOT %desktop_database_postun %icon_theme_cache_postun -%post -n libgnome-control-center1 -p /sbin/ldconfig - -%postun -n libgnome-control-center1 -p /sbin/ldconfig - %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO @@ -257,13 +240,8 @@ rm -rf $RPM_BUILD_ROOT %defattr (-, root, root) %{_datadir}/pixmaps/faces/ -%files -n libgnome-control-center1 -%defattr (-, root, root) -%{_libdir}/libgnome-control-center.so.1* - %files devel %defattr (-, root, root) %{_datadir}/pkgconfig/gnome-keybindings.pc -%{_libdir}/*.so %changelog