diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index c65b443..fca0e92 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ upower-0.9.5.tar.bz2 /upower-v1.90.7.tar.bz2 /upower-v1.90.8.tar.bz2 /upower-v1.90.9.tar.bz2 +/upower-v1.90.10.tar.bz2 +/upower-v1.91.0.tar.bz2 diff --git a/plans/integration.fmf b/plans/integration.fmf new file mode 100644 index 0000000..aa2d392 --- /dev/null +++ b/plans/integration.fmf @@ -0,0 +1,19 @@ +summary: Test for Upower +discover: + how: fmf +prepare: + - name: packages + how: install + package: + - upower + - upower-tests + - umockdev-devel + - dbus-x11 + - polkit-devel + - python3-dbus + - python3-dbusmock + - python3-gobject-base + - python3-pip + - python3-packaging +execute: + how: tmt diff --git a/sources b/sources index d2899f5..c586f4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (upower-v1.90.9.tar.bz2) = 7308e03125a5a888242253f9260f68283f5b53677c08dbc4d7e4d48cc6f600f50f8ab161d100f152138208d5119acddc90f0f19742aa8cca58e3a0ec54975110 +SHA512 (upower-v1.91.0.tar.bz2) = 32801d3ee4c5086221a9f12062b0f2e6765b239f68a562c24ef7808999bb34e299e6acd31acf5c414cf41613709c97b20ad64d252e1d8ddf23183576b156cf93 diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf new file mode 100644 index 0000000..683aaf3 --- /dev/null +++ b/tests/integration/main.fmf @@ -0,0 +1,2 @@ +summary: Upower integration test +test: bash ./run-it.sh diff --git a/tests/run-it.sh b/tests/integration/run-it.sh similarity index 87% rename from tests/run-it.sh rename to tests/integration/run-it.sh index d480ee1..8b086bf 100755 --- a/tests/run-it.sh +++ b/tests/integration/run-it.sh @@ -2,7 +2,7 @@ set -u # main script -IT="${1:-source/src/linux/integration-test.py}" +IT="${1:-/usr/libexec/installed-tests/upower/integration-test.py}" # check if we need to install additional packages # which is the case if we are on RHEL 8 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index f7723ef..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-source - tags: - - always - required_packages: - - git-core - - role: standard-test-basic - tags: - - atomic - - classic - required_packages: - - upower - - polkit-libs - - python3-gobject-base - - python3-dbus - - python3-dbusmock - - python3-packaging - - umockdev-devel - tests: - - smoke: - dir: smoke - run: upower -d - - integration: - dir: . - run: ./run-it.sh source/src/linux/integration-test.py diff --git a/upower.spec b/upower.spec index 44e665d..87a9f4c 100644 --- a/upower.spec +++ b/upower.spec @@ -1,9 +1,9 @@ Summary: Power Management Service Name: upower -Version: 1.90.9 +Version: 1.91.0 Release: %autorelease License: GPL-2.0-or-later -URL: http://upower.freedesktop.org/ +URL: https://upower.freedesktop.org/ Source0: https://gitlab.freedesktop.org/upower/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 BuildRequires: meson @@ -102,7 +102,8 @@ mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed- %ghost %dir %{_localstatedir}/lib/upower %dir %{_sysconfdir}/UPower %config %{_sysconfdir}/UPower/UPower.conf -%{_bindir}/* +%{_sysconfdir}/UPower/UPower.conf.d/README.md +%{_bindir}/upower %{_libexecdir}/upowerd %{_mandir}/man1/* %{_mandir}/man7/* @@ -133,6 +134,8 @@ mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed- %files tests %{_libexecdir}/installed-tests/upower +%dir %{_datadir}/installed-tests/ +%dir %{_datadir}/installed-tests/upower/ %{_datadir}/installed-tests/upower/upower-integration.test %changelog