Drop ExcludeArch for IBM Z to allow building there for COSMIC

Resolves: #2273291

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -19,3 +19,5 @@ fprintd-0.1-04fd09cfa.tar.bz2
 /fprintd-v1.94.0.tar.gz
 /fprintd-v1.94.1.tar.gz
 /fprintd-v1.94.2.tar.gz
+/fprintd-v1.94.4.tar.gz
+/fprintd-v1.94.5.tar.gz

0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch

@@ -1,28 +0,0 @@
-From 3633dbaa630d4734f3c63721eecbf935315cb80d Mon Sep 17 00:00:00 2001
-From: Julian <julian@aternos.org>
-Date: Sun, 1 May 2022 00:29:09 +0200
-Subject: [PATCH] Don't try to clear storage on devices without internal
- storage This change prevents warnings like 'Failed to clear storage before
- first enrollment: Device has no storage.'.
-
----
- src/device.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/device.c b/src/device.c
-index df1e782..b9de3ee 100644
---- a/src/device.c
-+++ b/src/device.c
-@@ -2209,7 +2209,8 @@ fprint_device_enroll_start (FprintDBusDevice      *dbus_dev,
-   priv->enroll_data = finger;
-   priv->current_action = ACTION_ENROLL;
- 
--  if (!fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) &&
-+  if (fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE) &&
-+      !fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) &&
-       is_first_enrollment (rdev))
-     {
-       g_autoptr(GError) clear_err = NULL;
--- 
-2.38.1
-

fprintd.spec

@@ -1,12 +1,12 @@
 Name:		fprintd
-Version:	1.94.2
+Version:	1.94.5
 Release:	%autorelease
 Summary:	D-Bus service for Fingerprint reader access
 
-License:	GPLv2+
+# man page is GFDL-1.1-or-later
+License:	GPL-2.0-or-later AND GFDL-1.1-or-later
 Source0:	https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v%{version}/fprintd-v%{version}.tar.gz
 Url:		http://www.freedesktop.org/wiki/Software/fprint/fprintd
-ExcludeArch:    s390 s390x
 
 BuildRequires:	meson
 BuildRequires:	gcc
@@ -18,12 +18,11 @@ BuildRequires:	polkit-devel
 BuildRequires:	gtk-doc
 BuildRequires:	gettext
 BuildRequires:	perl-podlators
-BuildRequires:	systemd
-BuildRequires:	systemd-devel
+BuildRequires:	pkgconfig(libsystemd)
+BuildRequires:	pkgconfig(systemd)
 BuildRequires:	python3-dbusmock
 BuildRequires:	python3-libpamtest
 
-Patch0: 0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch
 
 %description
 D-Bus service to access fingerprint readers.
@@ -37,7 +36,7 @@ Provides:	pam_fprint = %{version}-%{release}
 Obsoletes:	pam_fprint < 0.2-3
 Requires(postun): authselect >= 0.3
 
-License:	GPLv2+
+License:	GPL-2.0-or-later
 
 %description pam
 PAM module that uses the fprintd D-Bus service for fingerprint
@@ -46,7 +45,9 @@ authentication.
 %package devel
 Summary:	Development files for %{name}
 Requires:	%{name} = %{version}-%{release}
-License:	GFDL
+# dbus interfaces are GPL-2.0-or-later
+# documentation is GFDL-1.1-or-later
+License:	GPL-2.0-or-later AND GFDL-1.1-or-later
 BuildArch:	noarch
 
 %description devel
@@ -81,7 +82,7 @@ fi
 %{_datadir}/dbus-1/system-services/net.reactivated.Fprint.service
 %{_unitdir}/fprintd.service
 %{_datadir}/polkit-1/actions/net.reactivated.fprint.device.policy
-%{_localstatedir}/lib/fprint
+%attr(0700, -, -) %{_localstatedir}/lib/fprint
 %{_mandir}/man1/fprintd.1.gz
 
 %files pam

plans.fmf

@@ -0,0 +1,19 @@
+summary: Run all tests
+discover:
+  how: fmf
+  dist-git-source: true
+  dist-git-merge: true
+prepare:
+  - name: Disable installing everything from srpm
+    how: install
+    exclude: ".*"
+  - name: Install the main package
+    how: install
+    package:
+      - fprintd
+  - name: "%prep requires git"
+    how: install
+    package:
+      - git
+execute:
+  how: tmt

sources

@@ -1 +1 @@
-SHA512 (fprintd-v1.94.2.tar.gz) = 2fd9e03446b923b29a2a915d395dc85afe10589ea5d78f047e0d3ae2a96255178589d6072c1e10ed8ac607515e410b343aef62ea551baf272999bd012c33f8e0
+SHA512 (fprintd-v1.94.5.tar.gz) = ee71d1d8cfea99fb6711bd4039011702a1f31c59a23d13423fca8be17b43b29bf7a7434e0baf598f2d4bfefd42c08f2f7e3c6ebdf371d53aa9d6b7963d4732dc

tests/main.fmf

@@ -0,0 +1,10 @@
+/fprintd:
+  summary: Run fprintd.py
+  test: ./run.sh ./fprintd.py
+  require:
+    - python3-gobject-base
+    - python3-dbus
+    - python3-cairo
+    - dbus-daemon
+    - python3-dbusmock
+  duration: 10m

tests/run.sh

@@ -10,7 +10,7 @@ if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then
 fi
 
 # Switch into the tests directory
-cd source/tests || exit 1
+cd ../fprintd-*/tests || exit 1
 
 # Run actual test
-exec python3 "$@"
+exec python3 "$@"

tests/tests.yml

@@ -1,24 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-source
-    tags:
-    - always
-    required_packages:
-    - git
-  - role: standard-test-basic
-    tags:
-    - atomic
-    - classic
-    required_packages:
-    - fprintd
-    - python3-gobject-base
-    - python3-dbus
-    - python3-cairo
-    - dbus-daemon
-    - python3-dbusmock
-    tests:
-    - fprintd:
-        dir: .
-        run: run.sh ./fprintd.py
-        timeout: 10m