- add systemd user service startup, fix package names, rel 6

[packages/redshift.git] / redshift.spec

diff --git a/redshift.spec b/redshift.spec
index efe2689cf177c31e21cd330d6f439dc93337b0a6..e51457b2741d2ba90c7717146b9dbc248d8a6182 100644 (file)
--- a/redshift.spec
+++ b/redshift.spec
@@ -1,32 +1,30 @@
 Summary:       Adjusts the color temperature of your screen according to time of day
 Name:          redshift
-Version:       1.10
-Release:       1
+Version:       1.12
+Release:       6
 License:       GPL v3+
 Group:         Applications/System
-Source0:       http://launchpad.net/redshift/trunk/v%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: 3a5480b8dd5d28a877a0cb407619fd76
-# Remove Ubuntu specific geoclue provider
-Patch0:                %{name}-geoclue-provider.patch
-# https://bugs.launchpad.net/redshift/+bug/888661
-# http://bazaar.launchpad.net/~jonls/redshift/trunk/revision/165
+Source0:       https://github.com/jonls/redshift/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 5d04f2413dacdf3434cb86f373842462
 URL:           http://jonls.dk/redshift/
-BuildRequires: GConf2-devel
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 BuildRequires: desktop-file-utils
-BuildRequires: geoclue-devel
 BuildRequires: gettext-tools >= 0.17
 BuildRequires: glib2-devel >= 1:2.26
 BuildRequires: intltool >= 0.50
 BuildRequires: libdrm-devel
+BuildRequires: libtool
 BuildRequires: libxcb-devel
 BuildRequires: pkgconfig
 BuildRequires: python3 >= 3.2
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.219
+BuildRequires: rpmbuild(macros) >= 2.011
 BuildRequires: sed >= 4.0
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXxf86vm-devel
+Requires(post,preun):  systemd-units >= 1:250.1
+Requires:      systemd-units >= 1:250.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,7 +39,7 @@ from night to daytime temperature to allow your eyes to slowly adapt.
 
 This package provides the base program.
 
-%package -n %{name}-gtk
+%package gtk
 Summary:       GTK integration for Redshift
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
@@ -50,15 +48,14 @@ Requires:   python3 >= 3.2
 Requires:      python3-pyxdg
 Obsoletes:     gtk-redshift
 
-%description -n %{name}-gtk
+%description gtk
 This package provides GTK integration for Redshift, a screen color
 temperature adjustment program.
 
 %prep
 %setup -q
-%patch0 -p1
 
-%{__sed} -i -e '1s,^#!.*python,#!%{__python},' src/redshift-gtk/redshift-gtk.in
+%{__sed} -i -e '1s,^#!.*python3,#!%{__python3},' src/redshift-gtk/redshift-gtk.in
 
 %build
 %{__gettextize}
@@ -68,13 +65,15 @@ temperature adjustment program.
 %{__automake}
 %{__autoconf}
 %configure \
+       am_cv_python_pythondir=%{py3_sitescriptdir} \
        --disable-silent-rules \
        --enable-drm \
        --enable-geoclue \
        --enable-geoclue2 \
        --enable-gui \
        --enable-randr \
-       --enable-vidmode
+       --enable-vidmode \
+       --with-systemduserunitdir=%{systemduserunitdir}
 %{__make}
 
 %install
@@ -91,24 +90,29 @@ desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/redshift-gtk.desktop
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n %{name}-gtk
+%post gtk
 %update_icon_cache hicolor
+%systemd_user_post redshift-gtk.service
 
-%postun -n %{name}-gtk
+%preun gtk
+%systemd_user_preun redshift-gtk.service
+
+%postun gtk
 %update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc DESIGN HACKING NEWS README README-colorramp
+%doc CONTRIBUTING.md DESIGN NEWS README README-colorramp redshift.conf.sample
 %attr(755,root,root) %{_bindir}/redshift
 %{_mandir}/man1/redshift.1*
 
-%files -n %{name}-gtk
+%files gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/redshift-gtk
 %{_datadir}/appdata/redshift-gtk.appdata.xml
 %{py3_sitescriptdir}/redshift_gtk
 %{_iconsdir}/hicolor/scalable/apps/redshift*.svg
+%{_desktopdir}/redshift.desktop
 %{_desktopdir}/redshift-gtk.desktop
 %{systemduserunitdir}/redshift.service
 %{systemduserunitdir}/redshift-gtk.service