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 fffe587..f9433f0 100644 --- a/.gitignore +++ b/.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 diff --git a/changelog b/changelog deleted file mode 100644 index b9fc61c..0000000 --- a/changelog +++ /dev/null @@ -1,219 +0,0 @@ -* Wed Nov 03 2021 Benjamin Berg - 1.94.1-1 -- Update to 1.94.1 (#1978269) -- Install PAM module into /usr - -* Mon Oct 25 2021 Benjamin Berg - 1.94.0-2 -- Drop unneeded rm from spec file -- Rebuild with changelog fixed - -* Fri Aug 20 2021 Benjamin Berg - 1.94.0-1 -- Update to 1.94.0 (#1978269) - Related: #1894694 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.92.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jul 01 2021 Benjamin Berg - 1.92.0-1 -- Update to 1.92.0 (#1978269) - -* Thu May 27 2021 Benjamin Berg - 1.90.9-2 -- Use GFDL abbreviation as GFDLv1.1+ is not listed -- Do not hardcode unit path - -* Tue Jan 26 2021 Fedora Release Engineering - 1.90.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 13 13:33:37 CET 2021 Benjamin Berg - 1.90.9-1 -- Update to 1.90.9 (#1915788) - Resolves: #1909669 - Resolves: #1909559 - -* Fri Dec 18 2020 Adam Williamson - 1.90.8-2 -- Rebuild for libnss dependency issue - -* Fri Dec 11 2020 Benjamin Berg - 1.90.8-1 -- Update to 1.90.8 (#1902255) - This fixes PAM not working when fprintd was just started - -* Wed Dec 09 2020 Benjamin Berg - 1.90.7-1 -- Update to 1.90.7 (#1902255) - Resolves: #1905667 - Resolves: #1905964 - -* Mon Dec 07 2020 Benjamin Berg - 1.90.6-1 -- Update to 1.90.6 (#1902255) - Resolves: #1904370 - -* Tue Dec 01 2020 Benjamin Berg - 1.90.5-1 -- Update to 1.90.5 (#1902255) - -* Mon Jul 27 2020 Fedora Release Engineering - 1.90.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Feb 10 2020 Bastien Nocera - 1.90.1-1 -+ fprintd-1.90.1-1 -- Update to 1.90.1 - -* Tue Jan 28 2020 Fedora Release Engineering - 0.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Aug 14 2019 Benjamin Berg - 0.9.0-1 -+ fprintd-0.9.0-1 -- Update to 0.9.0 -- Add patch to fix length check of rhost - -* Thu Jul 25 2019 Fedora Release Engineering - 0.8.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 20 2018 Bastien Nocera - 0.8.1-3 -+ fprintd-0.8.1-3 -- Fix missing .service file in files by installing systemd - -* Fri Jul 13 2018 Fedora Release Engineering - 0.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 15 2018 Bastien Nocera - 0.8.1-1 -+ fprintd-0.8.1-1 -- Update to 0.8.1 -- Fixes a possible crash on exit (#1515720) - -* Wed May 30 2018 Bastien Nocera - 0.8.0-4 -+ fprintd-0.8.0-4 -- Rebuild - -* Tue Feb 20 2018 Pavel Březina - 0.8.0-3 -+ fprintd-0.8.0-3 -- Switch from authconfig to authselect - -* Wed Feb 07 2018 Fedora Release Engineering - 0.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Sep 13 2017 Bastien Nocera - 0.8.0-1 -+ fprintd-0.8.0-1 -- Update to 0.8.0 - -* Wed Aug 02 2017 Fedora Release Engineering - 0.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 09 2017 Bastien Nocera - 0.7.0-2 -+ fprintd-0.7.0-2 -- Fix fprintd-pam being disabled after upgrade (#1398371) - -* Wed Oct 12 2016 Bastien Nocera - 0.7.0-1 -+ fprintd-0.7.0-1 -- Update to 0.7.0 - -* Thu Sep 22 2016 Bastien Nocera - 0.6.0-5 -- Fix warning when uninstalling fprintd-pam (#1203671) - -* Wed Feb 03 2016 Fedora Release Engineering - 0.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 21 2015 Till Maas - 0.6.0-2 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Tue Feb 03 2015 Bastien Nocera 0.6.0-1 -- Update to 0.6.0 - -* Sat Aug 16 2014 Fedora Release Engineering - 0.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 11 2013 Bastien Nocera 0.5.1-1 -- Update to 0.5.1 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Mar 05 2013 Bastien Nocera 0.5.0-1 -- Update to 0.5.0 - -* Tue Feb 19 2013 Bastien Nocera 0.4.1-5 -- Co-own the gtk-doc directory (#604351) - -* Wed Feb 13 2013 Fedora Release Engineering - 0.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 0.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Nov 10 2011 Bastien Nocera 0.4.1-1 -- Update to 0.4.1 - -* Tue Feb 08 2011 Fedora Release Engineering - 0.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 09 2010 Ray Strode 0.2.0-2 -- Don't allow pam module to ever get unmapped, since that causes - crashes in dbus-glib, gobject, etc. - -* Thu Aug 19 2010 Bastien Nocera 0.2.0-1 -- Update to 0.2.0 - -* Wed Dec 09 2009 Bastien Nocera 0.1-16.git04fd09cfa -- Remove use of g_error(), or people think that it crashes when we actually - abort() (#543194) - -* Fri Jul 24 2009 Fedora Release Engineering - 0.1-15.git04fd09cfa -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 21 2009 Bastien Nocera 0.1-14.git04fd09cfa -- Merge polkit patch and fix for polkit patch - -* Tue Jul 21 2009 Bastien Nocera 0.1-13.git04fd09cfa -- Make the -devel package noarch (#507698) - -* Thu Jul 9 2009 Matthias Clasen 0.1-12.git04fd09cfa -- Fix the pam module (#510152) - -* Sat Jun 20 2009 Bastien Nocera 0.1-11.git04fd09cfa -- Remove obsolete patch - -* Tue Jun 9 2009 Matthias Clasen 0.1-10.git04fd09cfa -- Port to PolicyKit 1 - -* Thu May 07 2009 Bastien Nocera 0.1-9.git04fd09cfa -- Add /var/lib/fprint to the RPM to avoid SELinux errors (#499513) - -* Tue Apr 21 2009 Karsten Hopp 0.1-8.git04fd09cfa.1 -- Excludearch s390 s390x, as we don't have libusb1 on mainframe, we can't build - the required libfprint package - -* Tue Feb 24 2009 Fedora Release Engineering - 0.1-8.git04fd09cfa -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jan 27 2009 - Bastien Nocera - 0.1-7.git04fd09cfa -- Add a patch to handle device disconnects - -* Mon Jan 26 2009 - Bastien Nocera - 0.1-6.git04fd09cfa -- Update to latest git, fixes some run-time warnings - -* Wed Dec 17 2008 - Bastien Nocera - 0.1-5.git43fe72a2aa -- Add patch to stop leaking a D-Bus connection on failure - -* Tue Dec 09 2008 - Bastien Nocera - 0.1-4.git43fe72a2aa -- Update D-Bus config file for recent D-Bus changes - -* Thu Dec 04 2008 - Bastien Nocera - 0.1-3.git43fe72a2aa -- Update following comments in the review - -* Sun Nov 23 2008 - Bastien Nocera - 0.1-2.gitaf42ec70f3 -- Update to current git master, and add documentation - -* Tue Nov 04 2008 - Bastien Nocera - 0.1-1 -- First package diff --git a/fprintd.spec b/fprintd.spec index 737a5cd..183fadb 100644 --- a/fprintd.spec +++ b/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,7 +18,8 @@ BuildRequires: polkit-devel BuildRequires: gtk-doc BuildRequires: gettext BuildRequires: perl-podlators -BuildRequires: systemd-devel +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) BuildRequires: python3-dbusmock BuildRequires: python3-libpamtest @@ -35,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 @@ -44,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 @@ -79,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 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..c195230 --- /dev/null +++ b/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 diff --git a/sources b/sources index cf4d6aa..61cac3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fprintd-v1.94.2.tar.gz) = 2fd9e03446b923b29a2a915d395dc85afe10589ea5d78f047e0d3ae2a96255178589d6072c1e10ed8ac607515e410b343aef62ea551baf272999bd012c33f8e0 +SHA512 (fprintd-v1.94.5.tar.gz) = ee71d1d8cfea99fb6711bd4039011702a1f31c59a23d13423fca8be17b43b29bf7a7434e0baf598f2d4bfefd42c08f2f7e3c6ebdf371d53aa9d6b7963d4732dc diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..ebe3556 --- /dev/null +++ b/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 diff --git a/tests/run.sh b/tests/run.sh index ffd03db..9a6f061 100755 --- a/tests/run.sh +++ b/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 "$@" \ No newline at end of file +exec python3 "$@" diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 1a2a318..0000000 --- a/tests/tests.yml +++ /dev/null @@ -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