[redshift] Update to 1.8

[kmilos]

commit 7136053353318e004ef076f4d6362bcfd459fe04
Author: Miloš Komarčević <kmilos at gmail.com>
Date:   Sat Nov 30 20:41:22 2013 +0100

    Update to 1.8

 .gitignore                          |    1 +
 redshift-geoclue-client-check.patch |   55 -----------------------------------
 redshift.spec                       |   40 ++++++++++++++-----------
 sources                             |    2 +-
 4 files changed, 24 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b622fd..f229d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /redshift-1.7.tar.bz2
+/redshift-1.8-582ec61.tar.gz
diff --git a/redshift.spec b/redshift.spec
index d11b007..4a1128c 100644
--- a/redshift.spec
+++ b/redshift.spec
@@ -1,16 +1,16 @@
+%global commit 582ec614ab749c9b109d3184021c8e0eb7d3f147
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name: redshift
-Version: 1.7
-Release: 6%{dist}
+Version: 1.8
+Release: 1%{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
+Source0: https://github.com/jonls/redshift/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 # Remove Ubuntu specific geoclue provider
 Patch0: redshift-geoclue-provider.patch
-# https://bugs.launchpad.net/redshift/+bug/888661
-# http://bazaar.launchpad.net/~jonls/redshift/trunk/revision/165
-Patch1: redshift-geoclue-client-check.patch
 BuildRequires: gettext-devel
 BuildRequires: libXrandr-devel
 BuildRequires: libXxf86vm-devel
@@ -30,7 +30,7 @@ adapt.
 
 This package provides the base program.
 
-%package -n gtk-%{name}
+%package -n %{name}-gtk
 Summary: GTK integration for Redshift
 Group: Applications/System
 BuildRequires: python2
@@ -38,15 +38,15 @@ BuildRequires: desktop-file-utils
 Requires: pygtk2
 Requires: pyxdg
 Requires: %{name} = %{version}-%{release}
+Obsoletes: gtk-%{name} < 1.7-7
 
-%description -n gtk-%{name}
+%description -n %{name}-gtk
 This package provides GTK integration for Redshift, a screen color 
 temperature adjustment program.
 
 %prep
-%setup -q
+%setup -qn %{name}-%{commit}
 %patch0 -p1
-%patch1 -p0
 autoreconf -i -f
 
 %build
@@ -57,18 +57,18 @@ make %{?_smp_mflags} V=1
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install INSTALL="install -p"
 %find_lang %{name}
-desktop-file-validate %{buildroot}%{_datadir}/applications/gtk-redshift.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/redshift-gtk.desktop
 
-%post -n gtk-%{name}
+%post -n %{name}-gtk
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%postun -n gtk-%{name}
+%postun -n %{name}-gtk
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%posttrans -n gtk-%{name}
+%posttrans -n %{name}-gtk
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
@@ -77,14 +77,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/redshift
 %{_mandir}/man1/*
 
-%files -n gtk-%{name}
+%files -n %{name}-gtk
 %defattr(-,root,root,-)
-%{_bindir}/gtk-redshift
+%{_bindir}/redshift-gtk
 %{python_sitelib}/*
 %{_datadir}/icons/hicolor/scalable/apps/redshift*.svg
-%{_datadir}/applications/gtk-redshift.desktop
+%{_datadir}/applications/redshift-gtk.desktop
 
 %changelog
+* Thu Nov 30 2013 Milos Komarcevic <kmilos at gmail.com> - 1.8-1
+- Update to 1.8 (#1029155)
+- Source comes from GitHub now
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -107,7 +111,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Change default geoclue provider from Ubuntu GeoIP to Hostip
 - Remove manual Ubuntu icons uninstall
 
-* Sun Feb 28 2011 Milos Komarcevic <kmilos at gmail.com> - 1.6-3
+* Sun Feb 27 2011 Milos Komarcevic <kmilos at gmail.com> - 1.6-3
 - Fix for clock applet detection (#661145)
 - Require pyxdg explicitly (#675804)
 
diff --git a/sources b/sources
index 8e4cc83..5b040f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c56512afa292b5a94b715ed4a1841d4c  redshift-1.7.tar.bz2
+d9b3c3a4ce20af64f7217819ab1f6869  redshift-1.8-582ec61.tar.gz