+ fprintd-0.7.0-2

Fix fprintd-pam being disabled after upgrade (#1398371)

.fmf/version

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

.gitignore

@@ -5,19 +5,3 @@ fprintd-0.1-04fd09cfa.tar.bz2
 /fprintd-0.5.1.tar.xz
 /fprintd-0.6.0.tar.xz
 /fprintd-0.7.0.tar.xz
-/fprintd-0.8.0.tar.xz
-/fprintd-0.8.1.tar.xz
-/fprintd-0.9.0.tar.xz
-/fprintd-1.90.1.tar.xz
-/fprintd-v1.90.4.tar.gz
-/fprintd-v1.90.5.tar.gz
-/fprintd-v1.90.6.tar.gz
-/fprintd-v1.90.7.tar.gz
-/fprintd-v1.90.8.tar.gz
-/fprintd-v1.90.9.tar.gz
-/fprintd-v1.92.0.tar.gz
-/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

fprintd.spec

@@ -1,28 +1,23 @@
 Name:		fprintd
-Version:	1.94.5
-Release:	%autorelease
+Version:	0.7.0
+Release:	2%{?dist}
 Summary:	D-Bus service for Fingerprint reader access
 
-# 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
+Group:		System Environment/Daemons
+License:	GPLv2+
+Source0:	http://freedesktop.org/~hadess/%{name}-%{version}.tar.xz
 Url:		http://www.freedesktop.org/wiki/Software/fprint/fprintd
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    s390 s390x
 
-BuildRequires:	meson
-BuildRequires:	gcc
-BuildRequires:	gcc-c++
-BuildRequires:	git
+BuildRequires:	dbus-glib-devel
 BuildRequires:	pam-devel
-BuildRequires:	libfprint-devel >= 1.94.0
+BuildRequires:	libfprint-devel >= 0.1.0
 BuildRequires:	polkit-devel
 BuildRequires:	gtk-doc
-BuildRequires:	gettext
+BuildRequires:	intltool
+BuildRequires:  autoconf automake libtool
 BuildRequires:	perl-podlators
-BuildRequires:	pkgconfig(libsystemd)
-BuildRequires:	pkgconfig(systemd)
-BuildRequires:	python3-dbusmock
-BuildRequires:	python3-libpamtest
-
 
 %description
 D-Bus service to access fingerprint readers.
@@ -34,9 +29,10 @@ Requires:	%{name} = %{version}-%{release}
 # is different, it will be mentioned in the release notes
 Provides:	pam_fprint = %{version}-%{release}
 Obsoletes:	pam_fprint < 0.2-3
-Requires(postun): authselect >= 0.3
+Requires(postun): authconfig
 
-License:	GPL-2.0-or-later
+Group:		System Environment/Base
+License:	GPLv2+
 
 %description pam
 PAM module that uses the fprintd D-Bus service for fingerprint
@@ -45,9 +41,8 @@ authentication.
 %package devel
 Summary:	Development files for %{name}
 Requires:	%{name} = %{version}-%{release}
-# 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
+Group:		Development/Libraries
+License:	GFDLv1.1+
 BuildArch:	noarch
 
 %description devel
@@ -55,45 +50,170 @@ Development documentation for fprintd, the D-Bus service for
 fingerprint readers access.
 
 %prep
-%autosetup -S git -n %{name}-v%{version}
+%setup -q -n %{name}-%{version}
 
 %build
-%meson -Dgtk_doc=true -Dpam=true -Dpam_modules_dir=%{_libdir}/security
-%meson_build
+%configure --libdir=/%{_lib}/ --enable-gtk-doc --enable-pam
+
+make %{?_smp_mflags}
 
 %install
-%meson_install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/fprint
 
+rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_fprintd.{a,la,so.*}
+
 %find_lang %{name}
 
 %postun pam
 if [ $1 -eq 0 ]; then
-  /bin/authselect disable-feature with-fingerprint || :
+  /sbin/authconfig --disablefingerprint --update || :
 fi
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files -f %{name}.lang
+%defattr(-,root,root,-)
 %doc README COPYING AUTHORS TODO
 %{_bindir}/fprintd-*
 %{_libexecdir}/fprintd
 # FIXME This file should be marked as config when it does something useful
 %{_sysconfdir}/fprintd.conf
-%{_datadir}/dbus-1/system.d/net.reactivated.Fprint.conf
+%{_sysconfdir}/dbus-1/system.d/net.reactivated.Fprint.conf
 %{_datadir}/dbus-1/system-services/net.reactivated.Fprint.service
-%{_unitdir}/fprintd.service
+/usr/lib/systemd/system/fprintd.service
 %{_datadir}/polkit-1/actions/net.reactivated.fprint.device.policy
-%attr(0700, -, -) %{_localstatedir}/lib/fprint
+%{_localstatedir}/lib/fprint
 %{_mandir}/man1/fprintd.1.gz
 
 %files pam
+%defattr(-,root,root,-)
 %doc pam/README
-%{_libdir}/security/pam_fprintd.so
-%{_mandir}/man8/pam_fprintd.8.gz
+/%{_lib}/security/pam_fprintd.so
 
 %files devel
+%defattr(-,root,root,-)
 %{_datadir}/gtk-doc/
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Device.xml
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 %changelog
-%autochangelog
+* Thu Feb 09 2017 Bastien Nocera <bnocera@redhat.com> - 0.7.0-2
++ fprintd-0.7.0-2
+- Fix fprintd-pam being disabled after upgrade (#1398371)
+
+* Wed Oct 12 2016 Bastien Nocera <bnocera@redhat.com> - 0.7.0-1
++ fprintd-0.7.0-1
+- Update to 0.7.0
+
+* Thu Sep 22 2016 Bastien Nocera <bnocera@redhat.com> - 0.6.0-5
+- Fix warning when uninstalling fprintd-pam (#1203671)
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 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 <bnocera@redhat.com> 0.6.0-1
+- Update to 0.6.0
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 11 2013 Bastien Nocera <bnocera@redhat.com> 0.5.1-1
+- Update to 0.5.1
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Mar 05 2013 Bastien Nocera <bnocera@redhat.com> 0.5.0-1
+- Update to 0.5.0
+
+* Tue Feb 19 2013 Bastien Nocera <bnocera@redhat.com> 0.4.1-5
+- Co-own the gtk-doc directory (#604351)
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Nov 10 2011 Bastien Nocera <bnocera@redhat.com> 0.4.1-1
+- Update to 0.4.1
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Nov 09 2010 Ray Strode <rstrode@redhat.com> 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 <bnocera@redhat.com> 0.2.0-1
+- Update to 0.2.0
+
+* Wed Dec 09 2009 Bastien Nocera <bnocera@redhat.com> 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 <rel-eng@lists.fedoraproject.org> - 0.1-15.git04fd09cfa
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Bastien Nocera <bnocera@redhat.com> 0.1-14.git04fd09cfa
+- Merge polkit patch and fix for polkit patch
+
+* Tue Jul 21 2009 Bastien Nocera <bnocera@redhat.com> 0.1-13.git04fd09cfa
+- Make the -devel package noarch (#507698)
+
+* Thu Jul  9 2009 Matthias Clasen <mclasen@redhat.com> 0.1-12.git04fd09cfa
+- Fix the pam module (#510152)
+
+* Sat Jun 20 2009 Bastien Nocera <bnocera@redhat.com> 0.1-11.git04fd09cfa
+- Remove obsolete patch
+
+* Tue Jun 9 2009 Matthias Clasen <mclasen@redhat.com> 0.1-10.git04fd09cfa
+- Port to PolicyKit 1
+
+* Thu May 07 2009 Bastien Nocera <bnocera@redhat.com> 0.1-9.git04fd09cfa
+- Add /var/lib/fprint to the RPM to avoid SELinux errors (#499513)
+
+* Tue Apr 21 2009 Karsten Hopp <karsten@redhat.com> 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 <rel-eng@lists.fedoraproject.org> - 0.1-8.git04fd09cfa
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jan 27 2009 - Bastien Nocera <bnocera@redhat.com> - 0.1-7.git04fd09cfa
+- Add a patch to handle device disconnects
+
+* Mon Jan 26 2009 - Bastien Nocera <bnocera@redhat.com> - 0.1-6.git04fd09cfa
+- Update to latest git, fixes some run-time warnings
+
+* Wed Dec 17 2008 - Bastien Nocera <bnocera@redhat.com> - 0.1-5.git43fe72a2aa
+- Add patch to stop leaking a D-Bus connection on failure
+
+* Tue Dec 09 2008 - Bastien Nocera <bnocera@redhat.com> - 0.1-4.git43fe72a2aa
+- Update D-Bus config file for recent D-Bus changes
+
+* Thu Dec 04 2008 - Bastien Nocera <bnocera@redhat.com> - 0.1-3.git43fe72a2aa
+- Update following comments in the review
+
+* Sun Nov 23 2008 - Bastien Nocera <bnocera@redhat.com> - 0.1-2.gitaf42ec70f3
+- Update to current git master, and add documentation
+
+* Tue Nov 04 2008 - Bastien Nocera <bnocera@redhat.com> - 0.1-1
+- First package
+

gating.yaml

@@ -1,14 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

plans.fmf

@@ -1,19 +0,0 @@
-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.5.tar.gz) = ee71d1d8cfea99fb6711bd4039011702a1f31c59a23d13423fca8be17b43b29bf7a7434e0baf598f2d4bfefd42c08f2f7e3c6ebdf371d53aa9d6b7963d4732dc
+b5de08ec833c06f938d9731c21f3f048  fprintd-0.7.0.tar.xz

tests/main.fmf

@@ -1,10 +0,0 @@
-/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

@@ -1,16 +0,0 @@
-#!/usr/bin/bash
-set -u
-
-# 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
-    pip3 install python-dbusmock
-fi
-
-# Switch into the tests directory
-cd ../fprintd-*/tests || exit 1
-
-# Run actual test
-exec python3 "$@"