# Conditiional build:
%bcond_without ibus # ibus support need no yet released ibus 1.5 or at least devel 1.4.99 version
%bcond_without packagekit # packagekit 0.8.x doesn not supports poldek yet
-%bcond_without systemd # by default use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
#
Summary: GNOME Settings Daemon
Summary(pl.UTF-8): Demon ustawień GNOME
Name: gnome-settings-daemon
-Version: 3.6.4
+Version: 3.8.0
Release: 1
Epoch: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.6/%{name}-%{version}.tar.xz
-# Source0-md5: 362803ee1f1a0aa02e3c7df61ef82309
-Patch0: %{name}-pa-reconnect.patch
-Patch1: %{name}-link.patch
-Patch2: systemd-fallback.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.8/%{name}-%{version}.tar.xz
+# Source0-md5: e2a3a635088f896496c84733a0a7a605
URL: http://www.gnome.org/
%{?with_packagekit:BuildRequires: PackageKit-devel >= 0.8.0}
BuildRequires: autoconf >= 2.60
BuildRequires: cups-devel
BuildRequires: fontconfig-devel
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.32.0
-BuildRequires: gnome-desktop-devel >= 3.6.0
-BuildRequires: gsettings-desktop-schemas-devel >= 3.6.0
-BuildRequires: gtk+3-devel >= 3.4.0
+BuildRequires: glib2-devel >= 1:2.35.4
+BuildRequires: gnome-desktop-devel >= 3.7.90
+BuildRequires: gsettings-desktop-schemas-devel >= 3.7.2.1
+BuildRequires: gtk+3-devel >= 3.7.8
%{?with_ibus:BuildRequires: ibus-devel >= 1.4.99}
BuildRequires: intltool >= 0.40.0
BuildRequires: lcms2-devel >= 2.2
BuildRequires: libcanberra-gtk3-devel
BuildRequires: libnotify-devel >= 0.7.3
+BuildRequires: librsvg-devel >= 2.36.2
BuildRequires: libtool
-BuildRequires: libwacom-devel >= 0.6
+BuildRequires: libwacom-devel >= 0.7
BuildRequires: nss-devel >= 3.11.2
BuildRequires: pkgconfig
-BuildRequires: pulseaudio-devel >= 0.9.16
+BuildRequires: pulseaudio-devel >= 2.0
BuildRequires: rpmbuild(macros) >= 1.593
BuildRequires: sed >= 4.0
-%{?with_systemd:BuildRequires: systemd-devel}
BuildRequires: tar >= 1:1.22
BuildRequires: udev-glib-devel
BuildRequires: upower-devel >= 0.9.11
BuildRequires: xorg-lib-libXxf86misc-devel
BuildRequires: xorg-proto-kbproto-devel
BuildRequires: xz
-Requires(post,postun): glib2 >= 1:2.32.0
-Requires: gnome-desktop >= 3.6.0
-Requires: gsettings-desktop-schemas >= 3.6.0
-Requires: gtk+3 >= 3.4.0
+Requires(post,postun): glib2 >= 1:2.35.3
+Requires: gnome-desktop >= 3.7.90
+Requires: gsettings-desktop-schemas >= 3.7.2.1
+Requires: gtk+3 >= 3.7.8
Requires: gtk-update-icon-cache
Requires: hicolor-icon-theme
# sr@Latn vs. sr@latin
Summary(pl.UTF-8): Plik nagłówkowy do tworzenia klientów demona ustawień GNOME
Group: Development/Libraries
Requires: dbus-devel >= 1.2.0
-Requires: glib2-devel >= 1:2.32.0
+Requires: glib2-devel >= 1:2.35.3
# doesn't require base currently
%description devel
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%{?with_systemd:%patch2 -p1}
%build
%{__glib_gettextize}
%{__autoconf}
%{__automake}
%configure \
- %{__enable_disable systemd systemd} \
%{__enable_disable packagekit packagekit} \
%{__enable_disable ibus ibus} \
--disable-silent-rules
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog MAINTAINERS NEWS README
-%attr(755,root,root) %{_libexecdir}/gnome-fallback-mount-helper
%attr(755,root,root) %{_libexecdir}/gnome-settings-daemon
%attr(755,root,root) %{_libexecdir}/gsd-backlight-helper
%attr(755,root,root) %{_libexecdir}/gsd-input-sources-switcher
%dir %{_libdir}/gnome-settings-daemon-3.0
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libbackground.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libcolor.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libcursor.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liborientation.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libpower.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libremote-display.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libscreensaver-proxy.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsound.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libxsettings.so
%{_libdir}/gnome-settings-daemon-3.0/a11y-keyboard.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/a11y-settings.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-3.0/background.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/orientation.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/power.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/remote-display.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/screensaver-proxy.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
%{_iconsdir}/hicolor/*/*/*.png
%{_iconsdir}/hicolor/*/*/*.svg
%{_mandir}/man1/gnome-settings-daemon.1*
-%{_sysconfdir}/xdg/autostart/gnome-fallback-mount-helper.desktop
%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
%files devel
%attr(755,root,root) %{_libexecdir}/gsd-list-wacom
%attr(755,root,root) %{_libexecdir}/gsd-test-a11y-keyboard
%attr(755,root,root) %{_libexecdir}/gsd-test-a11y-settings
-%attr(755,root,root) %{_libexecdir}/gsd-test-background
+%attr(755,root,root) %{_libexecdir}/gsd-test-cursor
+%attr(755,root,root) %{_libexecdir}/gsd-test-housekeeping
%attr(755,root,root) %{_libexecdir}/gsd-test-input-helper
%attr(755,root,root) %{_libexecdir}/gsd-test-keyboard
%attr(755,root,root) %{_libexecdir}/gsd-test-media-keys
%attr(755,root,root) %{_libexecdir}/gsd-test-mouse
%attr(755,root,root) %{_libexecdir}/gsd-test-orientation
-%attr(755,root,root) %{_libexecdir}/gsd-test-power
%attr(755,root,root) %{_libexecdir}/gsd-test-print-notifications
-%attr(755,root,root) %{_libexecdir}/gsd-test-smartcard
+%attr(755,root,root) %{_libexecdir}/gsd-test-remote-display
%attr(755,root,root) %{_libexecdir}/gsd-test-sound
%attr(755,root,root) %{_libexecdir}/gsd-test-wacom
+%attr(755,root,root) %{_libexecdir}/gsd-test-wacom-osd
+%attr(755,root,root) %{_libexecdir}/gsd-test-xrandr
%attr(755,root,root) %{_libexecdir}/gsd-test-xsettings
%{_includedir}/gnome-settings-daemon-3.0
%{_pkgconfigdir}/gnome-settings-daemon.pc
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libupdates.so
%{_libdir}/gnome-settings-daemon-3.0/updates.gnome-settings-plugin
-%{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
%endif
+++ /dev/null
-diff -uNr gnome-settings-daemon-3.6.0/configure.ac gnome-settings-daemon-3.6.0.new/configure.ac
---- gnome-settings-daemon-3.6.0/configure.ac 2012-09-25 10:36:08.000000000 +0200
-+++ gnome-settings-daemon-3.6.0.new/configure.ac 2012-10-03 20:20:58.796757197 +0200
-@@ -347,7 +347,7 @@
- [with_systemd=$enableval],
- [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
-- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
- AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
- SESSION_TRACKING=systemd
- else
-diff -uNr gnome-settings-daemon-3.6.0/gnome-settings-daemon/gnome-settings-session.c gnome-settings-daemon-3.6.0.new/gnome-settings-daemon/gnome-settings-session.c
---- gnome-settings-daemon-3.6.0/gnome-settings-daemon/gnome-settings-session.c 2012-02-15 19:21:07.000000000 +0100
-+++ gnome-settings-daemon-3.6.0.new/gnome-settings-daemon/gnome-settings-session.c 2012-10-03 20:20:58.796757197 +0200
-@@ -30,6 +30,7 @@
- #include "gnome-settings-session.h"
-
- #ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
- #include <systemd/sd-login.h>
-
- typedef struct
-@@ -130,10 +131,9 @@
- {
- #ifdef HAVE_SYSTEMD
- GSource *sd_source;
--#else
-+#endif
- GDBusProxy *proxy_session;
- GCancellable *cancellable;
--#endif
- gchar *session_id;
- GnomeSettingsSessionState state;
- };
-@@ -237,7 +237,7 @@
- return TRUE;
- }
-
--#else /* HAVE_SYSTEMD */
-+#endif /* HAVE_SYSTEMD */
-
- static void
- gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
-@@ -371,22 +371,26 @@
- g_object_unref (proxy_manager);
- }
-
--#endif /* HAVE_SYSTEMD */
--
- static void
- gnome_settings_session_init (GnomeSettingsSession *session)
- {
- session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
-
- #ifdef HAVE_SYSTEMD
-- sd_pid_get_session (getpid(), &session->priv->session_id);
--
-- session->priv->sd_source = sd_source_new ();
-- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-- g_source_attach (session->priv->sd_source, NULL);
--
-- sessions_changed (session);
--#else
-+ session->priv->sd_source = NULL;
-+
-+ if (sd_booted () > 0) {
-+ sd_pid_get_session (getpid(), &session->priv->session_id);
-+
-+ session->priv->sd_source = sd_source_new ();
-+ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-+ g_source_attach (session->priv->sd_source, NULL);
-+
-+ sessions_changed (session);
-+
-+ return;
-+ }
-+#endif
- session->priv->cancellable = g_cancellable_new ();
-
- /* connect to ConsoleKit */
-@@ -399,7 +403,6 @@
- session->priv->cancellable,
- got_manager_proxy_cb,
- session);
--#endif
- }
-
- static void
-@@ -415,15 +418,16 @@
- if (session->priv->sd_source != NULL) {
- g_source_destroy (session->priv->sd_source);
- g_source_unref (session->priv->sd_source);
-+ goto out;
- }
--#else
-+#endif
- g_cancellable_cancel (session->priv->cancellable);
-
- if (session->priv->proxy_session != NULL)
- g_object_unref (session->priv->proxy_session);
- g_object_unref (session->priv->cancellable);
--#endif
-
-+out:
- G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
- }
-
-diff -uNr gnome-settings-daemon-3.6.0/plugins/common/gsd-power-helper.c gnome-settings-daemon-3.6.0.new/plugins/common/gsd-power-helper.c
---- gnome-settings-daemon-3.6.0/plugins/common/gsd-power-helper.c 2012-09-17 18:48:45.000000000 +0200
-+++ gnome-settings-daemon-3.6.0.new/plugins/common/gsd-power-helper.c 2012-10-03 20:20:58.796757197 +0200
-@@ -79,7 +79,7 @@
- g_object_unref (bus);
- }
-
--#else /* HAVE_SYSTEMD */
-+#endif /* HAVE_SYSTEMD */
-
- static void
- consolekit_stop_cb (GObject *source_object,
-@@ -170,34 +170,37 @@
- -1, NULL,
- upower_sleep_cb, NULL);
- }
--#endif /* HAVE_SYSTEMD */
-+
-
- void
- gsd_power_suspend (GDBusProxy *upower_proxy)
- {
- #ifdef HAVE_SYSTEMD
-- systemd_suspend ();
--#else
-- upower_suspend (upower_proxy);
-+ if (sd_booted () > 0)
-+ systemd_suspend ();
-+ else
- #endif
-+ upower_suspend (upower_proxy);
- }
-
- void
- gsd_power_poweroff (void)
- {
- #ifdef HAVE_SYSTEMD
-- systemd_stop ();
--#else
-- consolekit_stop ();
-+ if (sd_booted () > 0)
-+ systemd_stop ();
-+ else
- #endif
-+ consolekit_stop ();
- }
-
- void
- gsd_power_hibernate (GDBusProxy *upower_proxy)
- {
- #ifdef HAVE_SYSTEMD
-- systemd_hibernate ();
--#else
-- upower_hibernate (upower_proxy);
-+ if (sd_booted () > 0)
-+ systemd_hibernate ();
-+ else
- #endif
-+ upower_hibernate (upower_proxy);
- }
-diff -uNr gnome-settings-daemon-3.6.0/plugins/common/Makefile.am gnome-settings-daemon-3.6.0.new/plugins/common/Makefile.am
---- gnome-settings-daemon-3.6.0/plugins/common/Makefile.am 2012-09-17 18:48:45.000000000 +0200
-+++ gnome-settings-daemon-3.6.0.new/plugins/common/Makefile.am 2012-10-03 20:24:52.764019870 +0200
-@@ -17,6 +17,7 @@
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(COMMON_CFLAGS) \
-+ $(SYSTEMD_CFLAGS) \
- $(AM_CFLAGS)
-
- libcommon_la_LDFLAGS = \
-@@ -24,6 +25,7 @@
-
- libcommon_la_LIBADD = \
- $(SETTINGS_PLUGIN_LIBS) \
-+ $(SYSTEMD_LIBS) \
- $(COMMON_LIBS)
-
- libexec_PROGRAMS = gsd-test-input-helper
+++ /dev/null
-diff -urN gnome-settings-daemon-2.91.91/plugins/datetime/system-timezone.c gnome-settings-daemon-2.91.91.new//plugins/datetime/system-timezone.c
---- gnome-settings-daemon-2.91.91/plugins/datetime/system-timezone.c 2011-03-02 18:13:27.000000000 +0000
-+++ gnome-settings-daemon-2.91.91.new//plugins/datetime/system-timezone.c 2011-03-16 21:20:28.720003184 +0000
-@@ -55,12 +55,13 @@
- #include "system-timezone.h"
-
- /* Files that we look at */
--#define ETC_TIMEZONE "/etc/timezone"
--#define ETC_TIMEZONE_MAJ "/etc/TIMEZONE"
--#define ETC_RC_CONF "/etc/rc.conf"
--#define ETC_SYSCONFIG_CLOCK "/etc/sysconfig/clock"
--#define ETC_CONF_D_CLOCK "/etc/conf.d/clock"
--#define ETC_LOCALTIME "/etc/localtime"
-+#define ETC_TIMEZONE "/etc/timezone"
-+#define ETC_TIMEZONE_MAJ "/etc/TIMEZONE"
-+#define ETC_RC_CONF "/etc/rc.conf"
-+#define ETC_SYSCONFIG_CLOCK "/etc/sysconfig/clock"
-+#define ETC_SYSCONFIG_TIMEZONE "/etc/sysconfig/timezone"
-+#define ETC_CONF_D_CLOCK "/etc/conf.d/clock"
-+#define ETC_LOCALTIME "/etc/localtime"
-
- /* The first 4 characters in a timezone file, from tzfile.h */
- #define TZ_MAGIC "TZif"
-@@ -198,6 +199,7 @@
- * openSUSE: the TIMEZONE key in /etc/sysconfig/clock
- * Solaris/OpenSolaris: the TZ key in /etc/TIMEZONE
- * Arch Linux: the TIMEZONE key in /etc/rc.conf
-+ * PLD Linux: the TIMEZONE key in /etc/sysconfig/timezone
- * Gentoo (old): the ZONE key in /etc/conf.d/clock
- *
- * FIXME: reading the system-tools-backends, it seems there's this too:
-@@ -472,6 +474,22 @@
- "TIMEZONE", tz, error);
- }
-
-+/* This works for PLD Linux */
-+static char *
-+system_timezone_read_etc_sysconfig_timezone (void)
-+{
-+ return system_timezone_read_key_file (ETC_SYSCONFIG_TIMEZONE,
-+ "TIMEZONE");
-+}
-+
-+static gboolean
-+system_timezone_write_etc_sysconfig_timezone (const char *tz,
-+ GError **error)
-+{
-+ return system_timezone_write_key_file (ETC_SYSCONFIG_TIMEZONE,
-+ "TIMEZONE", tz, error);
-+}
-+
- /* This works for Arch Linux */
- static char *
- system_timezone_read_etc_rc_conf (void)
-@@ -696,6 +713,7 @@
- system_timezone_read_etc_timezone,
- system_timezone_read_etc_sysconfig_clock,
- system_timezone_read_etc_sysconfig_clock_alt,
-+ system_timezone_read_etc_sysconfig_timezone,
- system_timezone_read_etc_TIMEZONE,
- system_timezone_read_etc_rc_conf,
- /* reading deprecated config files */
-@@ -866,6 +884,7 @@
- system_timezone_write_etc_timezone,
- system_timezone_write_etc_sysconfig_clock,
- system_timezone_write_etc_sysconfig_clock_alt,
-+ system_timezone_write_etc_sysconfig_timezone,
- system_timezone_write_etc_TIMEZONE,
- system_timezone_write_etc_rc_conf,
- /* writing deprecated config files if they exist and have the
projects / packages / gnome-settings-daemon.git / commitdiff