Add systemd snippets and use macros for paths

Add the required systemd snippets[1] and use macros for the udev
rules and unit directories.
Also mark "%{_datadir}/gtk-doc" as directory as to avoid warnings
about duplicated entries, e.g:
  "warning: File listed twice: /usr/share/gtk-doc/html/UPower"

[1] https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#Systemd

.gitignore

@@ -1,3 +1,7 @@
+#testing
+tests/artifacts/
+tests/source/
+
 upower-0.9.5.tar.bz2
 /upower-0.9.6.tar.bz2
 /upower-0.9.7.tar.bz2
@@ -27,3 +31,5 @@ upower-0.9.5.tar.bz2
 /upower-0.99.7.tar.xz
 /upower-0.99.8.tar.xz
 /upower-0.99.9.tar.xz
+/upower-0.99.10.tar.xz
+/upower-0.99.11.tar.xz

sources

@@ -1 +1 @@
-SHA512 (upower-0.99.9.tar.xz) = 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
+SHA512 (upower-0.99.11.tar.xz) = 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803

tests/run-it.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/bash
+set -u
+
+# main script
+IT="${1:-source/src/linux/integration-test}"
+
+# check if we need to install additional packages
+# which is the case if we are on RHEL 8
+source /etc/os-release || exit 1
+
+if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then
+    dnf config-manager -y --add-repo umockdev.repo
+    dnf install -y umockdev-devel python3-gobject-base
+    pip3 install python-dbusmock
+fi
+
+# execute the integration test via umockdev-wrapper
+exec umockdev-wrapper "$IT"

tests/tests.yml

@@ -0,0 +1,23 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-source
+    tags:
+    - always
+  - role: standard-test-basic
+    tags:
+    - atomic
+    - classic
+    required_packages:
+    - upower
+    - pygobject3-devel
+    - python3-dbus
+    - python3-dbusmock
+    - umockdev-devel
+    tests:
+    - smoke:
+        dir: smoke
+        run: upower -d
+    - integration:
+        dir: .
+        run: ./run-it.sh source/src/linux/integration-test

upower.spec

@@ -1,7 +1,7 @@
-%global commit  2282c7c0e53fb31816b824c9d1f547e8
+%global commit  93cfe7c8d66ed486001c4f3f55399b7a
 Summary:        Power Management Service
 Name:           upower
-Version:        0.99.9
+Version:        0.99.11
 Release:        2%{?dist}
 License:        GPLv2+
 URL:            http://upower.freedesktop.org/
@@ -9,7 +9,6 @@ Source0:        https://gitlab.freedesktop.org/upower/upower/uploads/%{commit}/%
 
 BuildRequires:  sqlite-devel
 BuildRequires:  libtool
-BuildRequires:  intltool
 BuildRequires:  gettext
 BuildRequires:  libgudev1-devel
 %ifnarch s390 s390x
@@ -70,16 +69,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %ldconfig_scriptlets
 
+%post
+%systemd_post upower.service
+
+%preun
+%systemd_preun upower.service
+
+%postun
+%systemd_postun_with_restart upower.service
+
 %files -f upower.lang
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc NEWS AUTHORS HACKING README
 %{_libdir}/libupower-glib.so.*
-%{_sysconfdir}/dbus-1/system.d/*.conf
+%{_datadir}/dbus-1/system.d/*.conf
 %ifnarch s390 s390x
-/usr/lib/udev/rules.d/*.rules
+%{_udevrulesdir}/*.rules
 %endif
-%dir %{_localstatedir}/lib/upower
+%ghost %dir %{_localstatedir}/lib/upower
 %dir %{_sysconfdir}/UPower
 %config %{_sysconfdir}/UPower/UPower.conf
 %{_bindir}/*
@@ -89,7 +97,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man7/*
 %{_mandir}/man8/*
 %{_datadir}/dbus-1/system-services/*.service
-/usr/lib/systemd/system/*.service
+%{_unitdir}/*.service
 
 %files devel
 %{_datadir}/dbus-1/interfaces/*.xml
@@ -101,11 +109,31 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/libupower-glib/upower.h
 
 %files devel-docs
-%{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html/UPower
 %{_datadir}/gtk-doc/html/UPower/*
 
 %changelog
+* Wed Sep  4 2019 Christian Kellner <ckellner@redhat.com> - 0.99.11-2
+- Add systemd service snippets
+- Use macros for _unitdir and _udevrulesdir
+- Mark _datadir/gtk-doc as directory
+
+* Tue Sep  3 2019 Christian Kellner <ckellner@redhat.com> - 0.99.11-1
+- New upstream release 0.99.11
+- Intltool has been replaced by gettext
+- D-Bus configuration moved from sysconfdir to datadir
+- Systemd is creating /var/lib/upower, so 'ghost' the dir
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Feb 20 2019 Christian Kellner <ckellner@redhat.com> - 0.99.10-1
+- New upstream release with the following changes:
+- Set 'pending-charge' for DisplayDevice if at least one battery is in
+  the 'pending-charge' state
+- Map pending-charge to fully-charged when charge is 100%
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild