diff --git a/.gitignore b/.gitignore index 5354494..c51c3a2 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ gnome-settings-daemon-2.31.6.tar.bz2 /gnome-settings-daemon-2.91.93.tar.bz2 /gnome-settings-daemon-3.0.0.tar.bz2 /gnome-settings-daemon-3.0.0.1.tar.bz2 +/gnome-settings-daemon-3.0.1.tar.bz2 diff --git a/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch b/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch new file mode 100644 index 0000000..d78e1eb --- /dev/null +++ b/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch @@ -0,0 +1,27 @@ +From 2c748a6d841dc2b673df975b28ebffcbe76b4bce Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 28 Apr 2011 15:51:13 +0100 +Subject: [PATCH] datetime: Fix setting NTP on Fedora 15 + +https://bugzilla.gnome.org/show_bug.cgi?id=648556 +--- + plugins/datetime/gsd-datetime-mechanism.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/plugins/datetime/gsd-datetime-mechanism.c b/plugins/datetime/gsd-datetime-mechanism.c +index 2c43a4a..6ea8d83 100644 +--- a/plugins/datetime/gsd-datetime-mechanism.c ++++ b/plugins/datetime/gsd-datetime-mechanism.c +@@ -745,7 +745,8 @@ gsd_datetime_mechanism_set_using_ntp (GsdDatetimeMechanism *mechanism, + return FALSE; + + if (g_file_test ("/sbin/chkconfig", G_FILE_TEST_EXISTS)) /* Fedora */ +- cmd = g_strconcat ("/sbin/chkconfig --level 2345 ntpd ", using_ntp ? "on" : "off", NULL); ++ /* We omit --level 2345 so that systemd doesn't try to use the SysV init scripts */ ++ cmd = g_strconcat ("/sbin/chkconfig ntpd ", using_ntp ? "on" : "off", NULL); + else if (g_file_test ("/usr/sbin/update-rc.d", G_FILE_TEST_EXISTS)) /* Debian */ + cmd = g_strconcat ("/usr/sbin/update-rc.d ntp ", using_ntp ? "enable" : "disable", NULL); + else { +-- +1.7.4.4 + diff --git a/0001-updates-deal-with-absence-of-gnome-session-gracefull.patch b/0001-updates-deal-with-absence-of-gnome-session-gracefull.patch new file mode 100644 index 0000000..6d4347c --- /dev/null +++ b/0001-updates-deal-with-absence-of-gnome-session-gracefull.patch @@ -0,0 +1,44 @@ +From 5de806c640d812041d0174307c628e0385c81561 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Mon, 2 May 2011 14:23:53 -0400 +Subject: [PATCH] updates: deal with absence of gnome-session gracefully + +This was leading to crashes when g-s-d got started under xfce. +--- + plugins/updates/gsd-updates-refresh.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/plugins/updates/gsd-updates-refresh.c b/plugins/updates/gsd-updates-refresh.c +index 15e6917..60d5f80 100644 +--- a/plugins/updates/gsd-updates-refresh.c ++++ b/plugins/updates/gsd-updates-refresh.c +@@ -560,7 +560,7 @@ gsd_updates_refresh_init (GsdUpdatesRefresh *refresh) + /* use gnome-session for the idle detection */ + refresh->priv->proxy_session = + g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, +- G_DBUS_PROXY_FLAGS_NONE, ++ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, + NULL, /* GDBusInterfaceInfo */ + "org.gnome.SessionManager", + "/org/gnome/SessionManager/Presence", +@@ -578,9 +578,14 @@ gsd_updates_refresh_init (GsdUpdatesRefresh *refresh) + refresh); + status = g_dbus_proxy_get_cached_property (refresh->priv->proxy_session, + "status"); +- g_variant_get (status, "u", &status_code); +- refresh->priv->session_idle = (status_code == PRESENCE_STATUS_IDLE); +- g_variant_unref (status); ++ if (status) { ++ g_variant_get (status, "u", &status_code); ++ refresh->priv->session_idle = (status_code == PRESENCE_STATUS_IDLE); ++ g_variant_unref (status); ++ } ++ else { ++ refresh->priv->session_idle = FALSE; ++ } + } + + /* we check this in case we miss one of the async signals */ +-- +1.7.5 + diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 5c15310..e82201c 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon -Version: 3.0.0.1 -Release: 1%{?dist} +Version: 3.0.1 +Release: 4%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -14,6 +14,7 @@ Requires(preun): GConf2 >= 2.14 Requires(post): GConf2 >= 2.14 Requires: control-center-filesystem +Requires: system-config-printer-udev BuildRequires: dbus-glib-devel BuildRequires: GConf2-devel @@ -38,6 +39,9 @@ BuildRequires: upower-devel BuildRequires: libgudev1-devel BuildRequires: nss-devel +Patch0: 0001-datetime-Fix-setting-NTP-on-Fedora-15.patch +Patch1: 0001-updates-deal-with-absence-of-gnome-session-gracefull.patch + %description A daemon to share settings from GNOME to other applications. It also handles global keybindings, as well as a number of desktop-wide settings. @@ -54,6 +58,8 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .sysv +%patch1 -p1 -b .updates-crash autoreconf -i -f @@ -196,6 +202,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh %changelog +* Mon May 2 2011 Matthias Clasen 3.0.1-4 +- Try to fix a crash (#698533) + +* Thu Apr 28 2011 Bastien Nocera 3.0.1-2 +- Fix setting ntpd usage with SystemD + +* Tue Apr 26 2011 Bastien Nocera 3.0.1-1 +- Update to 3.0.1 + * Wed Apr 06 2011 Bastien Nocera 3.0.0.1-1 - Update to 3.0.0.1 diff --git a/sources b/sources index 41aa8d3..5bba4a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58a43395204d84dfda08d6ee3020711d gnome-settings-daemon-3.0.0.1.tar.bz2 +6407fa30e1f36481d3fe7de50f61d535 gnome-settings-daemon-3.0.1.tar.bz2