Merge remote-tracking branch 'upstream/master'

[deb_pkgs/autorandr.git] / contrib / packaging / autorandr.spec

diff --git a/contrib/packaging/autorandr.spec b/contrib/packaging/autorandr.spec
index 91f87af12f4922d9ec383731011ff549cdc5408c..1b4877cbd4327a3d22a7ed4d01a8d41ea4d270da 100644 (file)
--- a/contrib/packaging/autorandr.spec
+++ b/contrib/packaging/autorandr.spec
@@ -1,5 +1,13 @@
+%define use_pm_utils 1
+%if 0%{?fedora} > 22
+%define use_pm_utils 0
+%endif
+%if 0%{?rhel} > 7
+%define use_pm_utils 0
+%endif
+
 Name:           autorandr
-Version:        1.1
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Automatically select a display configuration based on connected devices
 
@@ -8,7 +16,12 @@ URL:            https://github.com/phillipberndt/autorandr
 Source0:        https://github.com/phillipberndt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildArch:     noarch
-Requires:       systemd udev bash-completion pm-utils
+Requires:       python2
+%if 0%{?use_pm_utils}
+Requires:      pm-utils
+%endif
+%{?systemd_ordering}
+BuildRequires: systemd
 
 %description
 
@@ -21,25 +34,39 @@ Requires:       systemd udev bash-completion pm-utils
 %install
 
 install -D -m 755 autorandr.py %{buildroot}%{_bindir}/autorandr
-install -D -m 644 contrib/bash_completion/autorandr %{buildroot}%{_sysconfdir}/bash_completion.d/autorandr
+install -D -m 644 contrib/bash_completion/autorandr %{buildroot}%{_datarootdir}/autorandr/completions/autorandr
+install -d -m 755 %{buildroot}%{_datarootdir}/bash-completion/completions
+ln -s ../../autorandr/completions/autorandr %{buildroot}%{_datarootdir}/bash-completion/completions/autorandr
 install -D -m 755 contrib/pm-utils/40autorandr %{buildroot}%{_sysconfdir}/pm/sleep.d/40autorandr
-install -D -m 644 contrib/systemd/autorandr.service %{buildroot}%{_sysconfdir}/systemd/system/autorandr.service
+install -D -m 644 contrib/systemd/autorandr.service %{buildroot}%{_unitdir}/autorandr.service
 #install -D -m 644 contrib/udev/40-monitor-hotplug.rules %{buildroot}%{_sysconfdir}/udev/rules.d/40-monitor-hotplug.rules
 install -D -m 644 contrib/etc/xdg/autostart/autorandr.desktop %{buildroot}%{_sysconfdir}/etc/xdg/autostart/autorandr.desktop
 
 %files
 %defattr(-,root,root,-)
+%attr(0644,root,root) %{_unitdir}/autorandr.service
 
 %license gpl-3.0.txt 
 %doc README.md
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/*
+%{_datarootdir}/autorandr/*
+%{_datarootdir}/bash-completion/completions/autorandr
 
 #%post
 #udevadm control --reload-rules
 
 
 %changelog
+* Fri Sep 28 2018 Maciej Sitarz <macieksitarz@wp.pl> - 1.7-1
+- Updated to stable 1.7
+* Thu Jul 19 2018 Maciej Sitarz <macieksitarz@wp.pl> - 1.5-1
+- Updated to stable 1.5
+- Changed dest path for systemd service file
+* Sun Oct 01 2017 Jerzy Drozdz <rpmbuilder@jdsieci.pl> - 1.1-2
+- Added conditionals for pm-utils, compability with Fedora26+
+- Removed bash-completion from requisites
+- Removed udev from requisites
 * Sun Sep 03 2017 Jerzy Drozdz <rpmbuilder@jdsieci.pl> - 1.1-1
 - Update to stable 1.1
 * Fri Feb 17 2017 Jerzy Drozdz <rpmbuilder@jdsieci.pl> - 20170217git-1