[redshift] Fixes for #661145 and #675804

[kmilos]

commit b00973c0968b9cb4b14f2df71e072eb616ec118b
Author: Miloš Komarčević <kmilos at gmail.com>
Date:   Sun Feb 27 12:23:56 2011 +0000

    Fixes for #661145 and #675804

 redshift-bonobo_iid-fix.patch |   32 ++++++++++++++++++++++++++++++++
 redshift.spec                 |   10 +++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/redshift-bonobo_iid-fix.patch b/redshift-bonobo_iid-fix.patch
new file mode 100644
index 0000000..58e53f6
--- /dev/null
+++ b/redshift-bonobo_iid-fix.patch
@@ -0,0 +1,32 @@
+diff -Naur redshift-1.6/src/location-gnome-clock.c redshift-1.6_bonobo_iid_fix/src/location-gnome-clock.c
+--- redshift-1.6/src/location-gnome-clock.c	2010-09-04 13:32:56.000000000 +0100
++++ redshift-1.6_bonobo_iid_fix/src/location-gnome-clock.c	2011-01-16 23:10:54.654764596 +0000
+@@ -104,11 +104,28 @@
+ 			char *bonobo_iid = gconf_client_get_string(client, key,
+ 								   &error);
+
++			/* Try both gnome-panel 2.30.x and earlier bonobo_iid key and
++			   newer applet_iid. */
+ 			if (!error && bonobo_iid != NULL &&
+ 			    !strcmp(bonobo_iid, "OAFIID:GNOME_ClockApplet")) {
+ 				clock_applet_count += 1;
+ 				current_city = find_current_city(client, id);
+ 			}
++			else {
++				g_free(key);
++				key = g_strdup_printf("/apps/panel/applets/%s"
++					    "/applet_iid", id);
++				char *applet_iid = gconf_client_get_string(client, key,
++									    &error);
++
++				if (!error && applet_iid != NULL &&
++				    !strcmp(applet_iid, "ClockAppletFactory::ClockApplet")) {
++					clock_applet_count += 1;
++					current_city = find_current_city(client, id);
++				}
++
++				g_free(applet_iid);
++			}
+
+ 			g_free(bonobo_iid);
+ 			g_free(key);
diff --git a/redshift.spec b/redshift.spec
index c60e8b2..f6394d2 100644
--- a/redshift.spec
+++ b/redshift.spec
@@ -1,11 +1,13 @@
 Name: redshift
 Version: 1.6
-Release: 2%{dist}
+Release: 3%{dist}
 Summary: Adjusts the color temperature of your screen according to time of day
 Group: Applications/System
 License: GPLv3+
 URL: http://jonls.dk/redshift/
 Source0: http://launchpad.net/redshift/trunk/%{version}/+download/%{name}-%{version}.tar.bz2
+# https://bugs.launchpad.net/redshift/+bug/706353
+Patch0: redshift-bonobo_iid-fix.patch
 BuildRequires: gettext
 BuildRequires: libXrandr-devel
 BuildRequires: libXxf86vm-devel
@@ -30,6 +32,7 @@ Group: Applications/System
 BuildRequires: python2
 BuildRequires: desktop-file-utils
 Requires: pygtk2
+Requires: pyxdg
 Requires: %{name} = %{version}-%{release}
 
 %description -n gtk-%{name}
@@ -38,6 +41,7 @@ temperature adjustment program.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -77,6 +81,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/gtk-redshift.desktop
 
 %changelog
+* Sun Feb 28 2011 Milos Komarcevic <kmilos at gmail.com> - 1.6-3
+- Fix for clock applet detection (#661145)
+- Require pyxdg explicitly (#675804)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild