Author: glen Date: Tue Jan 18 06:05:32 2011 GMT Module: packages Tag: HEAD ---- Log message: - add dont-ever-unload.patch from fedora (fdo#31503) - apidocs subpackage; rel 2
---- Files affected: packages/fprintd: fprintd.spec (1.3 -> 1.4) , dont-ever-unload.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/fprintd/fprintd.spec diff -u packages/fprintd/fprintd.spec:1.3 packages/fprintd/fprintd.spec:1.4 --- packages/fprintd/fprintd.spec:1.3 Tue Jan 18 06:57:29 2011 +++ packages/fprintd/fprintd.spec Tue Jan 18 07:05:27 2011 @@ -1,16 +1,22 @@ # $Revision$, $Date$ +# +# 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 @@ -24,6 +30,19 @@ %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 @@ -38,9 +57,11 @@ %prep %setup -q +%patch0 -p1 %build %configure \ + %{?with_apidocs:--enable-gtk-doc} \ --disable-static %{__make} \ @@ -55,7 +76,7 @@ %{__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 @@ -63,7 +84,7 @@ %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 @@ -81,12 +102,22 @@ %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 + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2011/01/18 06:05:27 glen +- add dont-ever-unload.patch from fedora (fdo#31503) +- apidocs subpackage; rel 2 + Revision 1.3 2011/01/18 05:57:29 glen - add /var/lib/fprint dir - dbus interfaces should go to -devel, but we have none ================================================================ Index: packages/fprintd/dont-ever-unload.patch diff -u /dev/null packages/fprintd/dont-ever-unload.patch:1.1 --- /dev/null Tue Jan 18 07:05:32 2011 +++ packages/fprintd/dont-ever-unload.patch Tue Jan 18 07:05:27 2011 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fprintd/fprintd.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
