make dist uses bz2, not xz

- This fixes various problems people have reported when trying to
  assign color profiles to devices with invalid EDIDs.

.gitignore

@@ -24,3 +24,9 @@ gnome-settings-daemon-2.31.6.tar.bz2
 /gnome-settings-daemon-3.1.2.tar.xz
 /gnome-settings-daemon-3.1.3.tar.xz
 /gnome-settings-daemon-3.1.4.tar.xz
+/gnome-settings-daemon-3.1.91.tar.xz
+/gnome-settings-daemon-3.1.92.tar.xz
+/gnome-settings-daemon-3.2.0.tar.xz
+/gnome-settings-daemon-3.2.1.tar.xz
+/gnome-settings-daemon-3.2.2.tar.xz
+/gnome-settings-daemon-3.2.3.tar.bz2

chrony-support.patch

@@ -1,84 +0,0 @@
-commit 44d7412eb6eb893a20bd82fb65d17e2da65636ee
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Tue Jul 19 14:09:23 2011 +0200
-
-    datetime: Add support for chrony NTP client
-
-diff --git a/plugins/datetime/gsd-datetime-mechanism-fedora.c b/plugins/datetime/gsd-datetime-mechanism-fedora.c
-index 9333d24..b0ad6e5 100644
---- a/plugins/datetime/gsd-datetime-mechanism-fedora.c
-+++ b/plugins/datetime/gsd-datetime-mechanism-fedora.c
-@@ -28,6 +28,18 @@
- #include "gsd-datetime-mechanism-fedora.h"
- #include "gsd-datetime-mechanism.h"
- 
-+/* Return the name of the installed NTP client, prefer chrony if both chrony
-+ * and ntp are installed */
-+static const char
-+*get_ntp_client ()
-+{
-+        if (g_file_test ("/etc/chrony.conf", G_FILE_TEST_EXISTS))
-+                return "chrony";
-+        else if (g_file_test ("/etc/ntp.conf", G_FILE_TEST_EXISTS))
-+                return "ntp";
-+        return NULL;
-+}
-+
- gboolean
- _get_using_ntp_fedora  (DBusGMethodInvocation   *context)
- {
-@@ -35,10 +47,14 @@ _get_using_ntp_fedora  (DBusGMethodInvocation   *context)
-         GError *error = NULL;
-         gboolean can_use_ntp;
-         gboolean is_using_ntp;
-+        const char *ntp_client;
-+        char *cmd;
- 
--        if (g_file_test ("/etc/ntp.conf", G_FILE_TEST_EXISTS)) {
-+        ntp_client = get_ntp_client();
-+        if (ntp_client) {
-                 can_use_ntp = TRUE;
--                if (!g_spawn_command_line_sync ("/sbin/service ntpd status",
-+                cmd = g_strconcat ("/sbin/service ", ntp_client, "d status", NULL);
-+                if (!g_spawn_command_line_sync (cmd,
-                                                 NULL, NULL, &exit_status, &error)) {
-                         GError *error2;
-                         error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR,
-@@ -47,8 +63,10 @@ _get_using_ntp_fedora  (DBusGMethodInvocation   *context)
-                         g_error_free (error);
-                         dbus_g_method_return_error (context, error2);
-                         g_error_free (error2);
-+                        g_free (cmd);
-                         return FALSE;
-                 }
-+                g_free (cmd);
-                 if (exit_status == 0)
-                         is_using_ntp = TRUE;
-                 else
-@@ -69,13 +87,16 @@ _set_using_ntp_fedora  (DBusGMethodInvocation   *context,
- {
-         GError *error;
-         int exit_status;
-+        const char *ntp_client;
-         char *cmd;
- 
-         error = NULL;
- 
-+        ntp_client = get_ntp_client();
-+
-         /* 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);
-+        cmd = g_strconcat ("/sbin/chkconfig ", ntp_client, "d ", using_ntp ? "on" : "off", NULL);
- 
-         if (!g_spawn_command_line_sync (cmd,
-                                         NULL, NULL, &exit_status, &error)) {
-@@ -92,7 +113,7 @@ _set_using_ntp_fedora  (DBusGMethodInvocation   *context,
- 
-         g_free (cmd);
- 
--        cmd = g_strconcat ("/sbin/service ntpd ", using_ntp ? "restart" : "stop", NULL);;
-+        cmd = g_strconcat ("/sbin/service ", ntp_client, "d ", using_ntp ? "restart" : "stop", NULL);;
- 
-         if (!g_spawn_command_line_sync (cmd,
-                                         NULL, NULL, &exit_status, &error)) {

fallback-mounter.patch

@@ -1,28 +0,0 @@
-diff --git a/plugins/automount/Makefile.am b/plugins/automount/Makefile.am
-index 209feb1..ace425a 100644
---- a/plugins/automount/Makefile.am
-+++ b/plugins/automount/Makefile.am
-@@ -17,7 +17,8 @@ gnome_fallback_mount_helper_CFLAGS = \
- 
- gnome_fallback_mount_helper_LDADD = \
- 	$(SETTINGS_PLUGIN_LIBS) \
--	$(X11_LIBS)
-+	$(X11_LIBS) \
-+	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la
- 
- autostartdir = $(sysconfdir)/xdg/autostart
- autostart_in_files = gnome-fallback-mount-helper.desktop.in
-diff --git a/plugins/automount/gnome-fallback-mount-helper.c b/plugins/automount/gnome-fallback-mount-helper.c
-index ff5d192..9f7a1fa 100644
---- a/plugins/automount/gnome-fallback-mount-helper.c
-+++ b/plugins/automount/gnome-fallback-mount-helper.c
-@@ -22,7 +22,9 @@
- #include "config.h"
- 
- #include <glib.h>
-+#include <glib/gi18n.h>
- #include <unistd.h>
-+#include <gtk/gtk.h>
- 
- #include "gsd-automount-manager.h"
- 

gnome-settings-daemon.spec

@@ -1,19 +1,16 @@
 Name:           gnome-settings-daemon
-Version:        3.1.4
-Release:        2%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://download.gnome.org/sources/%{name}
 #VCS: git:git://git.gnome.org/gnome-settings-daemon
-Source:         http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
 
-# RFE: add support for chrony
-# https://bugzilla.redhat.com/show_bug.cgi?id=723212
-Patch0:         chrony-support.patch
-
-Patch1:         fallback-mounter.patch
+# Fedora specific patch
+Patch0: gsd-calculator.patch
 
 Requires(pre):    GConf2 >= 2.14
 Requires(preun):  GConf2 >= 2.14
@@ -21,6 +18,9 @@ Requires(post):   GConf2 >= 2.14
 
 Requires: control-center-filesystem
 
+# for the gcm-import, gcm-calibrate and gcm-viewer color integration
+Requires: gnome-color-manager
+
 BuildRequires:  dbus-glib-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  gtk3-devel >= 2.99.3
@@ -44,7 +44,7 @@ BuildRequires:  cups-devel
 BuildRequires:  upower-devel
 BuildRequires:  libgudev1-devel
 BuildRequires:  nss-devel
-BuildRequires:  colord-devel >= 0.1.9
+BuildRequires:  colord-devel >= 0.1.12
 BuildRequires:  lcms2-devel >= 2.2
 BuildRequires:  libXi-devel libXfixes-devel
 
@@ -64,8 +64,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .chrony
-%patch1 -p1 -b .fallback
+%patch0 -p1 -b .calc
 
 # autoreconf -i -f
 
@@ -106,7 +105,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS
 %dir %{_sysconfdir}/gnome-settings-daemon
 %dir %{_sysconfdir}/gnome-settings-daemon/xrandr
@@ -127,13 +125,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
 
-%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-3.0/libcolor.so
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
-
-%{_libdir}/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-3.0/libcursor.so
-
 %{_libdir}/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml
@@ -152,10 +143,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libmouse.so
 
-%{_libdir}/gnome-settings-daemon-3.0/orientation.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-3.0/liborientation.so
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.orientation.gschema.xml
-
+%{_libexecdir}/gsd-backlight-helper
+%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
 %{_libdir}/gnome-settings-daemon-3.0/power.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libpower.so
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml
@@ -209,7 +198,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
 %{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
 %{_datadir}/icons/hicolor/*/apps/gsd-xrandr.*
-%{_datadir}/icons/hicolor/*/actions/touchpad*
 %{_libexecdir}/gsd-datetime-mechanism
 %{_sysconfdir}/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
 %{_datadir}/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
@@ -226,13 +214,68 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/gnome-settings-daemon-3.0
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 %dir %{_datadir}/gnome-settings-daemon-3.0
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Tue Apr 03 2012 Bastien Nocera <bnocera@redhat.com> 3.2.3-1
+- Update to 3.2.3
+
+* Thu Mar 15 2012 Richard Hughes <rhughes@redhat.com> 3.2.2-2
+- Backport several color plugin fixes from the gnome-3-2 branch.
+- This fixes various problems people have reported when trying to
+  assign color profiles to devices with invalid EDIDs.
+
+* Fri Nov 11 2011 Bastien Nocera <bnocera@redhat.com> 3.2.2-1
+- Update to 3.2.2
+
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-4
+- Rebuilt for glibc bug#747377
+
+* Tue Oct 25 2011 Marek Kasik <mkasik@redhat.com> - 3.2.1-3
+- Fix a typo in registration of an object on DBus (#747318)
+
+* Mon Oct 24 2011 Matthias Clasen <mclasen@redhat.com> - 3.2.1-2
+- Fix calculator keybinding (#745367)
+
+* Mon Oct 17 2011 Bastien Nocera <bnocera@redhat.com> 3.2.1-1
+- Update to 3.2.1
+
+* Wed Oct 12 2011 Adam Williamson <awilliam@redhat.com> - 3.2.0-3
+- backports: another brightness fix and no idle sleep
+
+* Thu Oct  6 2011 Michel Salim <salimma@fedoraproject.org> - 3.2.0-2
+- Backport brightness fixes for power plugin
+
+* Tue Sep 27 2011 Ray <rstrode@redhat.com> - 3.2.0-1
+- Update to 3.2.0
+
+* Thu Sep 22 2011 Richard Hughes <rhughes@redhat.com> - 3.1.92-2
+- Add a Require: gnome-color-manager so users can calibrate devices.
+
+* Tue Sep 20 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.92-1
+- Update to 3.1.92
+
+* Tue Sep  6 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-1
+- Update to 3.1.91
+
+* Tue Aug 30 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.90-1
+- Update to 3.1.90
+
+* Tue Aug 16 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.5-1
+- Update to 3.1.5
+
+* Tue Aug 16 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.4-5
+- Fix a crash a startup (#728903)
+
+* Fri Aug 12 2011 Peter Hutterer <peter.hutterer@redhat.com> 3.1.4-4
+- This time with the patch.
+
+* Fri Aug 12 2011 Peter Hutterer <peter.hutterer@redhat.com> 3.1.4-3
+- Invert TPCButton behaviour in wacom (#708894)
+
 * Tue Jul 26 2011 Cosimo Cecchi <cosimoc@redhat.com> - 3.1.4-2
 - Add a patch to make the fallback mounter to build correctly
 - Include the new power plugin

gsd-calculator.patch

@@ -0,0 +1,12 @@
+diff -up gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c.calculator gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c
+--- gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c.calculator	2011-10-24 18:37:57.154770995 -0400
++++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c	2011-10-24 18:38:12.044771972 -0400
+@@ -1496,7 +1496,7 @@ do_action (GsdMediaKeysManager *manager,
+                 do_media_action (manager, timestamp);
+                 break;
+         case CALCULATOR_KEY:
+-                do_execute_desktop (manager, "gcalctool.desktop", timestamp);
++                do_execute_desktop (manager, "gnome-gcalctool.desktop", timestamp);
+                 break;
+         case PLAY_KEY:
+                 return do_multimedia_player_action (manager, "Play");

sources

@@ -1 +1 @@
-c95910376e4310afa497cdc33dc09ae0  gnome-settings-daemon-3.1.4.tar.xz
+59e3e5f1555742ba71228dc1a26a56ef  gnome-settings-daemon-3.2.3.tar.bz2