- add dont-ever-unload.patch from fedora (fdo#31503)

- apidocs subpackage; rel 2

Changed files:
    dont-ever-unload.patch -> 1.1
    fprintd.spec -> 1.4

diff --git a/dont-ever-unload.patch b/dont-ever-unload.patch
new file mode 100644 (file)
index 0000000..cb2dc59
--- /dev/null
+++ b/dont-ever-unload.patch
@@ -0,0 +1,19 @@
+Don't allow PAM module to get unloaded
+
+It uses libraries which can't handle being unloaded very
+gracefully.
+
+http://bugs.freedesktop.org/show_bug.cgi?id=31503
+
+diff -up fprintd-0.2.0/pam/Makefile.am.dont-ever-unload fprintd-0.2.0/pam/Makefile.am
+--- fprintd-0.2.0/pam/Makefile.am.dont-ever-unload     2010-11-09 10:55:30.452135193 -0500
++++ fprintd-0.2.0/pam/Makefile.am      2010-11-09 10:55:32.954860614 -0500
+@@ -5,7 +5,7 @@ pammoddir=$(libdir)/security
+ 
+ pam_fprintd_la_SOURCES = pam_fprintd.c $(MARSHALFILES)
+ pam_fprintd_la_CFLAGS = -fPIC $(WARN_CFLAGS) $(GLIB_CFLAGS)
+-pam_fprintd_la_LDFLAGS = -avoid-version -module
++pam_fprintd_la_LDFLAGS = -avoid-version -module -Wl,-z,nodelete
+ pam_fprintd_la_LIBADD = $(PAM_LIBS) $(GLIB_LIBS)
+ 
+ MARSHALFILES = marshal.c marshal.h

diff --git a/fprintd.spec b/fprintd.spec
index 2a2620cb9b9c625a246af38e8fc874d7ee3233eb..ccee0e8c10273d4a57b4e4de5ea16317e22d5a5d 100644 (file)
--- a/fprintd.spec
+++ b/fprintd.spec
@@ -1,15 +1,21 @@
+#
+# Conditional build:
+%bcond_without apidocs         # do not build and package API docs
+
 Summary:       Daemon to offer libfprint functionality over D-Bus
 Summary(pl.UTF-8):     Demon oferujący funkcjonalność libfprint poprzez D-Bus
 Name:          fprintd
 Version:       0.2.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.bz2
 # Source0-md5: d6f023e6560d5647eadf668cdbcee57a
+Patch0:                dont-ever-unload.patch
 URL:           http://www.reactivated.net/fprint/wiki/Fprintd
 BuildRequires: dbus-glib-devel
 BuildRequires: glib2-devel >= 2.0.0
+%{?with_apidocs:BuildRequires:  gtk-doc}
 BuildRequires: libfprint-devel >= 0.1.0
 BuildRequires: libxslt-progs
 BuildRequires: pam-devel
@@ -23,6 +29,19 @@ Daemon to offer libfprint functionality over D-Bus.
 %description -l pl.UTF-8
 Demon oferujący funkcjonalność libfprint poprzez D-Bus.
 
+%package apidocs
+Summary:       fprintd API documentation
+Summary(pl.UTF-8):     Dokumentacja API biblioteki fprintd
+License:       GFDL v1.1+
+Group:         Documentation
+Requires:      gtk-doc
+
+%description apidocs
+API and internal documentation for fprintd library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki fprintd.
+
 %package -n pam-pam_fprintd
 Summary:       PAM module for fingerprint authentication
 Summary(pl.UTF-8):     Moduł PAM do uwierzytelniania odciskiem palca
@@ -37,9 +56,11 @@ Moduł PAM do uwierzytelniania odciskiem palca.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
+       %{?with_apidocs:--enable-gtk-doc} \
        --disable-static
 
 %{__make} \
@@ -54,7 +75,7 @@ install -d $RPM_BUILD_ROOT/var/lib/fprint
 
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_fprintd.la
 
-# to -devel, but we haven't  any
+# to -devel, but we haven't any
 rm $RPM_BUILD_ROOT%{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.*.xml
 
 %clean
@@ -62,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO doc/html/*
+%doc AUTHORS NEWS README TODO
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fprintd.conf
 %attr(755,root,root) %{_bindir}/fprintd-delete
 %attr(755,root,root) %{_bindir}/fprintd-enroll
@@ -79,3 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc pam/README
 %attr(755,root,root) /%{_lib}/security/pam_fprintd.so
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_datadir}/gtk-doc/html/fprintd
+%endif