From 27fd9bd9e8102ad15cb2871d7052ce8a7eb1f617 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Wed, 21 May 2025 15:19:22 +0800
Subject: [PATCH 1/9] Move the test files to the upower-tests package

---
 upower.spec | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/upower.spec b/upower.spec
index e4d6e7c..44e665d 100644
--- a/upower.spec
+++ b/upower.spec
@@ -54,6 +54,13 @@ BuildArch: noarch
 %description devel-docs
 Developer documentation for for libupower-glib.
 
+%package tests
+Summary: Test files for Upower
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description tests
+Test files for Upower
+
 %prep
 %autosetup -n %{name}-v%{version} -p1 -S git
 
@@ -69,6 +76,9 @@ Developer documentation for for libupower-glib.
 %install
 %meson_install
 
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+
 %find_lang upower
 
 %ldconfig_scriptlets
@@ -93,15 +103,14 @@ Developer documentation for for libupower-glib.
 %dir %{_sysconfdir}/UPower
 %config %{_sysconfdir}/UPower/UPower.conf
 %{_bindir}/*
-%{_libexecdir}/*
+%{_libexecdir}/upowerd
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*
 %{_datadir}/dbus-1/system-services/*.service
 %{_unitdir}/*.service
-%{_datadir}/installed-tests/upower/upower-integration.test
 %{_datadir}/polkit-1/actions/org.freedesktop.upower.policy
-%{_datadir}/zsh
+%{_datadir}/zsh/*
 
 %files libs
 %license COPYING
@@ -122,5 +131,9 @@ Developer documentation for for libupower-glib.
 %dir %{_datadir}/gtk-doc/html/UPower
 %{_datadir}/gtk-doc/html/UPower/*
 
+%files tests
+%{_libexecdir}/installed-tests/upower
+%{_datadir}/installed-tests/upower/upower-integration.test
+
 %changelog
 %autochangelog

From 59781ca9580ae855a436e62cbd48c83fada1efea Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Wed, 21 May 2025 15:45:48 +0800
Subject: [PATCH 2/9] Revert "Move the test files to the upower-tests package"

This reverts commit 27fd9bd9e8102ad15cb2871d7052ce8a7eb1f617.
---
 upower.spec | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/upower.spec b/upower.spec
index 44e665d..e4d6e7c 100644
--- a/upower.spec
+++ b/upower.spec
@@ -54,13 +54,6 @@ BuildArch: noarch
 %description devel-docs
 Developer documentation for for libupower-glib.
 
-%package tests
-Summary: Test files for Upower
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description tests
-Test files for Upower
-
 %prep
 %autosetup -n %{name}-v%{version} -p1 -S git
 
@@ -76,9 +69,6 @@ Test files for Upower
 %install
 %meson_install
 
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
-mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
-
 %find_lang upower
 
 %ldconfig_scriptlets
@@ -103,14 +93,15 @@ mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-
 %dir %{_sysconfdir}/UPower
 %config %{_sysconfdir}/UPower/UPower.conf
 %{_bindir}/*
-%{_libexecdir}/upowerd
+%{_libexecdir}/*
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*
 %{_datadir}/dbus-1/system-services/*.service
 %{_unitdir}/*.service
+%{_datadir}/installed-tests/upower/upower-integration.test
 %{_datadir}/polkit-1/actions/org.freedesktop.upower.policy
-%{_datadir}/zsh/*
+%{_datadir}/zsh
 
 %files libs
 %license COPYING
@@ -131,9 +122,5 @@ mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-
 %dir %{_datadir}/gtk-doc/html/UPower
 %{_datadir}/gtk-doc/html/UPower/*
 
-%files tests
-%{_libexecdir}/installed-tests/upower
-%{_datadir}/installed-tests/upower/upower-integration.test
-
 %changelog
 %autochangelog

From 40391129a572ea691a82deb564cfb957f481e2a6 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Wed, 21 May 2025 15:19:22 +0800
Subject: [PATCH 3/9] Move the test files to the upower-tests package

Move test file to the tests packages.

Resolves: #2351829
---
 upower.spec | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/upower.spec b/upower.spec
index e4d6e7c..44e665d 100644
--- a/upower.spec
+++ b/upower.spec
@@ -54,6 +54,13 @@ BuildArch: noarch
 %description devel-docs
 Developer documentation for for libupower-glib.
 
+%package tests
+Summary: Test files for Upower
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description tests
+Test files for Upower
+
 %prep
 %autosetup -n %{name}-v%{version} -p1 -S git
 
@@ -69,6 +76,9 @@ Developer documentation for for libupower-glib.
 %install
 %meson_install
 
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+
 %find_lang upower
 
 %ldconfig_scriptlets
@@ -93,15 +103,14 @@ Developer documentation for for libupower-glib.
 %dir %{_sysconfdir}/UPower
 %config %{_sysconfdir}/UPower/UPower.conf
 %{_bindir}/*
-%{_libexecdir}/*
+%{_libexecdir}/upowerd
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*
 %{_datadir}/dbus-1/system-services/*.service
 %{_unitdir}/*.service
-%{_datadir}/installed-tests/upower/upower-integration.test
 %{_datadir}/polkit-1/actions/org.freedesktop.upower.policy
-%{_datadir}/zsh
+%{_datadir}/zsh/*
 
 %files libs
 %license COPYING
@@ -122,5 +131,9 @@ Developer documentation for for libupower-glib.
 %dir %{_datadir}/gtk-doc/html/UPower
 %{_datadir}/gtk-doc/html/UPower/*
 
+%files tests
+%{_libexecdir}/installed-tests/upower
+%{_datadir}/installed-tests/upower/upower-integration.test
+
 %changelog
 %autochangelog

From 8b4f2fc33014c6de0e4c552ca27c10f0bb3a98fc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 19:49:53 +0000
Subject: [PATCH 4/9] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From f8b971fcb652e2cd716563b6dfec0ed69dfe5959 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Tue, 5 Aug 2025 15:12:59 +0800
Subject: [PATCH 5/9] Migrate to tmt test

Resolves: #2383092
---
 .fmf/version                      |  1 +
 plans/integration.fmf             | 19 +++++++++++++++++++
 tests/integration/main.fmf        |  2 ++
 tests/{ => integration}/run-it.sh |  2 +-
 tests/tests.yml                   | 27 ---------------------------
 5 files changed, 23 insertions(+), 28 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/integration.fmf
 create mode 100644 tests/integration/main.fmf
 rename tests/{ => integration}/run-it.sh (87%)
 delete mode 100644 tests/tests.yml

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/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/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

From 4c15a189e86a08ff9c944ec036f9c908843f2324 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Thu, 28 Aug 2025 15:41:56 +0800
Subject: [PATCH 6/9] Upower owns /usr/share/installed-tests/upower

Upower owns its test directory.

Resolves: rhbz#2281974
---
 upower.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upower.spec b/upower.spec
index 44e665d..04d2bda 100644
--- a/upower.spec
+++ b/upower.spec
@@ -133,6 +133,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

From a7310904eb121501e3d1d13cb2fa9578be82c19b Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Fri, 29 Aug 2025 14:58:04 +0800
Subject: [PATCH 7/9] Fix URL (rhbz#2387606)

Fix URL.
---
 upower.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upower.spec b/upower.spec
index 04d2bda..d5adaa1 100644
--- a/upower.spec
+++ b/upower.spec
@@ -3,7 +3,7 @@ Name:           upower
 Version:        1.90.9
 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

From 4fc4010f6d3fa67d6c374f8032d94c80bc4c96d5 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Fri, 29 Aug 2025 15:51:16 +0800
Subject: [PATCH 8/9] Update to the upstream version 1.90.10 (rhbz#2391004)

Update to version 1.90.10.
---
 .gitignore  | 1 +
 sources     | 2 +-
 upower.spec | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c65b443..eee096e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ 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
diff --git a/sources b/sources
index d2899f5..725b805 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (upower-v1.90.9.tar.bz2) = 7308e03125a5a888242253f9260f68283f5b53677c08dbc4d7e4d48cc6f600f50f8ab161d100f152138208d5119acddc90f0f19742aa8cca58e3a0ec54975110
+SHA512 (upower-v1.90.10.tar.bz2) = f7bfb4c4301b6155a17c6b1baf12947503037bb8f8827ab7993ade39ef1aaece64bc08318c73600f62cd5b2ff7d372cc58652045efa803fff5951abd466a3d63
diff --git a/upower.spec b/upower.spec
index d5adaa1..d3ee17d 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,6 +1,6 @@
 Summary:        Power Management Service
 Name:           upower
-Version:        1.90.9
+Version:        1.90.10
 Release:        %autorelease
 License:        GPL-2.0-or-later
 URL:            https://upower.freedesktop.org/

From b15ffc9b97d8cc79c7aa833dd38e2dd1987e867a Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Wed, 26 Nov 2025 16:51:27 +0800
Subject: [PATCH 9/9] Update to the upstream version 1.91.0

Update to 1.91.0

Resolves: #2416975
---
 .gitignore  | 1 +
 sources     | 2 +-
 upower.spec | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index eee096e..fca0e92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ upower-0.9.5.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/sources b/sources
index 725b805..c586f4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (upower-v1.90.10.tar.bz2) = f7bfb4c4301b6155a17c6b1baf12947503037bb8f8827ab7993ade39ef1aaece64bc08318c73600f62cd5b2ff7d372cc58652045efa803fff5951abd466a3d63
+SHA512 (upower-v1.91.0.tar.bz2) = 32801d3ee4c5086221a9f12062b0f2e6765b239f68a562c24ef7808999bb34e299e6acd31acf5c414cf41613709c97b20ad64d252e1d8ddf23183576b156cf93
diff --git a/upower.spec b/upower.spec
index d3ee17d..87a9f4c 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,6 +1,6 @@
 Summary:        Power Management Service
 Name:           upower
-Version:        1.90.10
+Version:        1.91.0
 Release:        %autorelease
 License:        GPL-2.0-or-later
 URL:            https://upower.freedesktop.org/
@@ -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/*