Accepting request 181348 from GNOME:Factory

Resubmit - with rpmlintc dropped.. depends on SR# Base:System / polkit-default-privs OBS-URL: https://build.opensuse.org/request/show/181348 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=91
2013-06-29 17:40:50 +00:00 · 2013-06-29 17:40:50 +00:00 · f59b091ddd
commit f59b091ddd
parent 5ec636abe5 545eecd0c2
5 changed files with 115 additions and 21 deletions
--- a/gnome-settings-daemon-3.8.2.tar.xz
+++ b/gnome-settings-daemon-3.8.2.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be
-size 1591764
--- a/gnome-settings-daemon-3.9.3.tar.xz
+++ b/gnome-settings-daemon-3.9.3.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c43fde7af2c2adf9e845dcac4836c229772bbf25aaa91c1e05839b5072d233e3
+size 1579636
--- a/gnome-settings-daemon-notify-idle-resumed.patch
+++ b/gnome-settings-daemon-notify-idle-resumed.patch
@ -1,7 +1,7 @@
-Index: gnome-settings-daemon-3.7.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+Index: gnome-settings-daemon-3.9.3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 ===================================================================
--- gnome-settings-daemon-3.7.90.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-+++ gnome-settings-daemon-3.7.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+--- gnome-settings-daemon-3.9.3.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ gnome-settings-daemon-3.9.3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -106,5 +106,10 @@
       <_summary>If we should show the recalled battery warning for a broken battery</_summary>
       <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
@ -13,11 +13,11 @@ Index: gnome-settings-daemon-3.7.90/data/org.gnome.settings-daemon.plugins.power
 +    </key>
   </schema>
 </schemalist>
-Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
+Index: gnome-settings-daemon-3.9.3/plugins/power/gsd-power-manager.c
 ===================================================================
--- gnome-settings-daemon-3.7.90.orig/plugins/power/gsd-power-manager.c
-+++ gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
-@@ -186,6 +186,7 @@ struct GsdPowerManagerPrivate
+--- gnome-settings-daemon-3.9.3.orig/plugins/power/gsd-power-manager.c
+++ gnome-settings-daemon-3.9.3/plugins/power/gsd-power-manager.c
+@@ -183,6 +183,7 @@ struct GsdPowerManagerPrivate
         NotifyNotification      *notification_low;
         NotifyNotification      *notification_sleep_warning;
         NotifyNotification      *notification_logout_warning;
@ -25,7 +25,7 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
         GsdPowerActionType       sleep_action_type;
         gboolean                 battery_is_low; /* laptop battery low, or UPS discharging */
 
-@@ -212,6 +213,7 @@ struct GsdPowerManagerPrivate
+@@ -208,6 +209,7 @@ struct GsdPowerManagerPrivate
         gboolean                 inhibit_suspend_taken;
         guint                    inhibit_lid_switch_timer_id;
         gboolean                 is_virtual_machine;
@ -33,7 +33,7 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
 
         /* Idles */
         GnomeIdleMonitor        *idle_monitor;
-@@ -2452,6 +2454,49 @@ is_session_active (GsdPowerManager *mana
+@@ -2339,6 +2341,49 @@ is_session_active (GsdPowerManager *mana
 }
 
 static void
@ -83,7 +83,7 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
 idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
 {
         gboolean ret = FALSE;
-@@ -2544,6 +2589,8 @@ idle_set_mode (GsdPowerManager *manager,
+@@ -2431,6 +2476,8 @@ idle_set_mode (GsdPowerManager *manager,
                         action_type = g_settings_get_enum (manager->priv->settings,
                                                            "sleep-inactive-ac-type");
                 }
@ -92,7 +92,7 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
                 do_power_action_type (manager, action_type);
 
         /* turn on screen and restore user-selected brightness level */
-@@ -2590,7 +2637,6 @@ idle_set_mode (GsdPowerManager *manager,
+@@ -2477,7 +2524,6 @@ idle_set_mode (GsdPowerManager *manager,
                         }
                         manager->priv->kbd_brightness_pre_dim = -1;
                 }
@ -100,8 +100,8 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
         }
 }
 
-@@ -3364,6 +3410,12 @@ handle_resume_actions (GsdPowerManager *
-         notify_close_if_showing (manager->priv->notification_ups_discharging);
+@@ -3252,6 +3298,12 @@ handle_resume_actions (GsdPowerManager *
+         notify_close_if_showing (&manager->priv->notification_ups_discharging);
         main_battery_or_ups_low_changed (manager, FALSE);
 
 +        if (manager->priv->last_idle_power_action == GSD_POWER_ACTION_SUSPEND ||
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@ -1,3 +1,95 @@
+-------------------------------------------------------------------
+Fri Jun 28 14:03:19 UTC 2013 - dimstar@opensuse.org
+
+- Drop rpmlintrc, as the polkit privileges were approved for
+  Factory (final security review pending).
+
+-------------------------------------------------------------------
+Fri Jun 21 19:23:51 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.9.3:
+  + Color:
+    - Bump colord dependency.
+  + Daemon:
+    - Fix possible crash on start when calling setenv() after
+      starting threads.
+  + Keyboard:
+    - Don't show on the bus before we're fully initialised.
+  + Power:
+    - Fix non-transient notifications sticking around.
+    - Simplify composite battery as advertised in the D-Bus API.
+  + Updates:
+    - Make sure only one notification appears.
+  + Wacom:
+    - Fix calling for calibration from the notification.
+    - Add configure button to the OSD window.
+- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
+- Drop gnome-settings-daemon-disabled-ibus.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Thu May 30 07:09:49 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.9.2:
+  + Color:
+    - Simplify code by using new libcolord feature.
+    - Fix warning with some screens.
+    - Fix possible CPU burn loop.
+  + Cursor:
+    - Disable plugin if the X version is too old.
+  + Housekeeping:
+    - Use GSettings features to clamp options.
+    - Fix incorrect handling of ignore_paths.
+  + Keyboard:
+    - Get layouts and variants from localed.
+    - Get XKB options from localed.
+    - Always try to activate the ibus daemon.
+    - Use the gtk+ ibus module if there's at least one ibus source.
+    - Make sure the XKB group in use is always what we want.
+    - Without settings or under GDM, make sure to add the US
+      layout.
+    - Add SetInputSource DBus method.
+    - Remove the input source switcher helper.
+    - Convert the XKB group switch option from libgnomekbd.
+    - Stop adding locale based input sources from a hardcoded list.
+  + Media-keys:
+    - Handle key grabbing and volume OSDs in gnome-shell.
+    - Remove unused multi-head support.
+    - Remove label for analog-output ports.
+    - Avoid leaking DESKTOP_AUTOSTART_ID to children.
+    - Fix possible crash when changing the volume.
+    - Add Rotation lock support.
+    - Change default 'Lock screen' keybinding to be Super+L.
+    - Show Shell's search when pressing the search button.
+    - Add support for XF86AudioMicMute key.
+  + Mouse:
+    - Enable two-finger scrolling by default.
+  + Plugins:
+    - Fix priority handling.
+    - Update for gnome-desktop API change.
+  + Power:
+    - Handle the shell coming back with a different screensaver
+      state.
+    - Don't change active state variable in VM.
+    - Don't look for screens if we don't have a lid.
+    - Don't poll for external monitors.
+    - Remove pre-dim brightness hack.
+    - Make "Screen when inactive" button in Settings work.
+  + Sound:
+    - Fix creation of sound theme directories.
+  + Updates:
+    - Fix a number of possible crashers, especially on exit.
+  + Wacom:
+    - Warn when screen has changed and calibration is needed.
+    - Add OLED support for Intuos4 tablets.
+    - Warn when tablet is not supported in GNOME.
+  + XSettings:
+    - Drop toolbar-style workaround.
+- Add pkgconfig(pango) BuildRequires: new dependency of the wacom
+  module.
+- Add gnome-settings-daemon-disabled-ibus.patch: Fix build with
+  configure --disable-ibus.
+- Add rpmlintrc to not hard block on the missing polkit privileges.
+
 -------------------------------------------------------------------
 Tue May 14 11:34:50 UTC 2013 - dimstar@opensuse.org

--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@ -27,13 +27,13 @@
 %define with_smartcard 0

 Name:           gnome-settings-daemon
-Version:        3.8.2
+Version:        3.9.3
 Release:        0
 Summary:        Settings daemon for the GNOME desktop
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-settings-daemon/3.8/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-settings-daemon/3.9/%{name}-%{version}.tar.xz
 # PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff
 Patch2:         gnome-settings-daemon-system-proxy-configuration.diff
 # PATCH-NEEDS-REBASE gnome-settings-daemon-apport-monitor.patch bnc439203 jblunck@novell.com -- Add apport monitoring plugin. (was PATCH-FEATURE-UPSTREAM)
@ -61,11 +61,11 @@ BuildRequires:  update-desktop-files
 BuildRequires:  xsltproc
 # For directory ownership; it's fine to BuildRequire it since it's also a Requires
 BuildRequires:  polkit
-BuildRequires:  pkgconfig(colord) >= 0.1.12
+BuildRequires:  pkgconfig(colord) >= 0.1.34
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(gconf-2.0) >= 2.6.1
 BuildRequires:  pkgconfig(glib-2.0) >= 2.35.3
-BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.7.90
+BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.9.0
 BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.7.2.1
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.7.8
 BuildRequires:  pkgconfig(gudev-1.0)
@ -85,6 +85,7 @@ BuildRequires:  pkgconfig(libsystemd-login)
 BuildRequires:  pkgconfig(libwacom) >= 0.7
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(packagekit-glib2) >= 0.7.4
+BuildRequires:  pkgconfig(pango) >= 1.20.0
 BuildRequires:  pkgconfig(upower-glib) >= 0.9.11
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
@ -193,12 +194,13 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-settings-daemon-3.0/
 %dir %{_libexecdir}/gnome-settings-daemon-3.0/
 %{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon
+%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon-localeexec
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
-%{_libexecdir}/gnome-settings-daemon-3.0/gsd-input-sources-switcher
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-list-wacom
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-led-helper
+%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-test-*
 # From patch2
 #%{_libexecdir}/novell-sysconfig-proxy-helper