Accepting request 68649 from home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/68649
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=82

gnome-settings-daemon-bnc427745-force-dpi.patch

@@ -1,13 +0,0 @@
-Index: plugins/xsettings/gsd-xsettings-manager.c
-===================================================================
---- plugins/xsettings/gsd-xsettings-manager.c.orig
-+++ plugins/xsettings/gsd-xsettings-manager.c
-@@ -237,6 +237,8 @@ get_dpi_from_x_server (void)
-         GdkScreen *screen;
-         double     dpi;
- 
-+        return DPI_FALLBACK;
-+
-         screen = gdk_screen_get_default ();
-         if (screen != NULL) {
-                 double width_dpi, height_dpi;

gnome-settings-daemon-rpmlintrc

@@ -1,2 +1,2 @@
-# This is temporary and should not enter Factory!
+# This is temporary and should not enter Factory! See bnc#690496.
 addFilter(".*polkit-unauthorized-privilege.*org.gnome.settingsdaemon.datetimemechanism.configure")

gnome-settings-daemon.changes

@@ -1,22 +1,15 @@
+-------------------------------------------------------------------
+Thu Apr 28 11:06:18 CEST 2011 - vuntz@opensuse.org
+
+- Pass --enable-gconf-bridge to build the gconf bridge (that
+  mirrors settings between gsettings and gconf).
+- Add nautilus Recommends, as the housekeeping plugin uses a dbus
+  service provided by nautilus to empty the trash. This is
+  optional at runtime, though, so don't make it a Requires.
+
 -------------------------------------------------------------------
 Wed Apr  6 13:16:57 UTC 2011 - fcrozat@novell.com
 
-- HUGE WARNING TO ALWAYS KEEP AT THE TOP HERE UNTIL WE MERGE TO
-  FACTORY.
-  + We need to rebase:
-    gnome-settings-daemon-system-proxy-configuration.diff
-    gnome-settings-daemon-apport-monitor.patch
-    gnome-settings-daemon-bnc462640-mute-action.patch
-    gnome-settings-daemon-add-layout-switcher.patch
-    gnome-packagekit-fate302445.patch
-    gnome-packagekit-BNC383261.patch
-  + gnome-patch-translation support was commented out until we
-    rebased those patches.
-  + Call to autoreconf was commented out for the same reason.
-  + Look at how to make the NTP stuff work on openSUSE.
-  + Remove the rpmlintrc file: this is a temporary fix, until we
-    can get the service accepted by the security team (we need to
-    ask for this).
 - Update to version 3.0.0.1:
   + Keyboard: Fix crash showing the keyboard layout in fallback
     mode.
@@ -57,7 +50,7 @@ Wed Apr  6 09:31:43 UTC 2011 - fcrozat@novell.com
   + Mouse:
     - Fix possible memory leak
     - Implement touchpad motion settings (bgo#642474)
-    - Fix shape handling in locate-pointer (#645092)
+    - Fix shape handling in locate-pointer (bgo#645092)
     - Handle touchpad handedness changing
     - Don't apply any settings if XInput isn't present
     - Separate device dependent calls
@@ -128,14 +121,10 @@ Wed Apr  6 09:31:43 UTC 2011 - fcrozat@novell.com
     - Fix memleak, using wrong unref function
   + Updated translations
 - Changes from version 2.91.9:
-  + XSettings:
-    - Initialize gtk-modules setting
-    - Support GTK/AutoMnemonics setting
   + Date & Time:
     - Use a single polkit action for this
-  + Media keys:
+  + Housekeeping:
-    - Prevent volume underflow
+    - Fix an untranslatable string
-    - Use symbolic icons for OSD
   + Keybindings:
     - Rename Accessibility keybindings to 'Universal Access'
     - Mark Accessibility keybindings as system
@@ -143,11 +132,15 @@ Wed Apr  6 09:31:43 UTC 2011 - fcrozat@novell.com
     - Don't create kbd indicators in the shell
     - Remove $GDM_KEYBOARD_LAYOUT handling
     - Fix control-center invocation
-  + Housekeeping:
+  + Media keys:
-    - Fix an untranslatable string
+    - Prevent volume underflow
+    - Use symbolic icons for OSD
   + Print notification:
     - New plugin for print notifications
     - Appearance and wording tweaks
+  + XSettings:
+    - Initialize gtk-modules setting
+    - Support GTK/AutoMnemonics setting
   + Updated translations
 - Changes from version 2.91.8:
   + Connect to the right GnomeRRScreen signal
@@ -160,16 +153,23 @@ Wed Apr  6 09:31:43 UTC 2011 - fcrozat@novell.com
 - Changes from version 2.91.6.1:
   + Suppress warnings due to gdk_error_trap_pop
   + Fix build with GTK+ 2.91.7
-- Add fix-a11y-start.patch: fix a11y startup (bgo645721)
-- Add BuildRequires : cups-devel, pkgconfig(gudev-1.0), 
-  pkgconfig(packagekit-glib2), pkgconfig(upower-glib)
-- set libexecdir to _libexecdir/gnome-settings-daemon-3.0 to ensure
-  upgrade from g-s-d 2.x works fine.
 - Drop gnome-settings-daemon-bnc427745-force-dpi.patch: fixed
-  upstream.
+  upstream as the DPI from the X server is not used anymore.
+- Disable gnome-settings-daemon-add-layout-switcher.patch: this
+  needs to be rebased.
 - Move gnome-packagekit-BNC383261.patch and
-  gnome-packagekit-fate302445.patch from gnome-packagekit to g-s-d
+  gnome-packagekit-fate302445.patch from gnome-packagekit to here,
-  update plugin (still need to be rebased).
+  since the code moved to the update plugin. They need to be
+  rebased, though.
+- Add BuildRequires : cups-devel, pkgconfig(gudev-1.0),
+  pkgconfig(packagekit-glib2), pkgconfig(upower-glib).
+- Set libexecdir to %_libexecdir/gnome-settings-daemon-3.0 to
+  ensure upgrade from g-s-d 2.x works fine.
+- Update temporary rpmlintrc since the action is now named
+  configure instead of configurentp.
+- Add support for source service checkout, with %BUILD_FROM_VCS:
+  + Add gnome-common BuildRequires.
+  + Add call to ./autogen.sh.
 
 -------------------------------------------------------------------
 Sun Feb 13 16:15:25 CET 2011 - vuntz@opensuse.org
@@ -297,6 +297,11 @@ Sun Dec 19 17:23:04 CET 2010 - vuntz@opensuse.org
 - Rebase gnome-settings-daemon-bnc427745-force-dpi.patch.
 - Rewrite gnome-settings-daemon-add-layout-switcher.patch,
   following the move to GSettings.
+- Disable gnome-settings-daemon-system-proxy-configuration.diff,
+  gnome-settings-daemon-apport-monitor.patch,
+  gnome-settings-daemon-bnc462640-mute-action.patch: those patches
+  need to be rebased. Because of this, we also comment out the
+  support for gnome-patch-translation and the call to autoreconf.
 - Remove dbus-1-devel, dbus-1-glib-devel, glib2-devel,
   gnome-desktop-devel, gnome-menus-devel, gtk2-devel Requires of
   devel package: the ones really needed will be automatically added

gnome-settings-daemon.spec

@@ -20,7 +20,6 @@
 Name:           gnome-settings-daemon
 Version:        3.0.0.1
 Release:        1
-# FIXME: there's a .changes entry explaining what needs to be fixed before pushing this package to Factory
 License:        GPLv2+
 Summary:        Settings daemon for the GNOME desktop
 Url:            http://www.gnome.org
@@ -73,6 +72,8 @@ BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(xi)
 Requires:       gsettings-desktop-schemas
 Recommends:     %{name}-lang
+# For housekeeping plugin, that uses the nautilus dbus service
+Recommends:     nautilus
 # Split so people can depend on this only if needed
 Requires:       %{name}-polkit-datetime = %{version}
 Obsoletes:      resapplet
@@ -142,6 +143,7 @@ NOCONFIGURE=1 /usr/bin/gnome-autogen.sh
 #autoreconf -f -i
 %configure\
         --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
+        --enable-gconf-bridge \
         --disable-static
 make %{?jobs:-j%jobs} V=1
 
@@ -169,15 +171,19 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS
-%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
 %{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
+%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
 %{_datadir}/gnome-settings-daemon/
 %{_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/gsd-locate-pointer
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer
-%{_libdir}/gnome-settings-daemon-3.0/
+%if "%{_libdir}" != "%{_libexecdir}"
+%dir %{_libdir}/gnome-settings-daemon-3.0/
+%endif
+%{_libdir}/gnome-settings-daemon-3.0/*.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/*.so
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml