From 7dc9c0a6717d68502c1ba9bbbe10d827ccd49c46 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Tue, 19 Apr 2011 17:54:10 +0000
Subject: [PATCH] - up to 0.4.1

Changed files:
    dont-ever-unload.patch -> 1.2
    fprintd.spec -> 1.8
---
 dont-ever-unload.patch | 19 -------------------
 fprintd.spec           | 14 +++++++-------
 2 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 dont-ever-unload.patch

diff --git a/dont-ever-unload.patch b/dont-ever-unload.patch
deleted file mode 100644
index cb2dc59..0000000
--- a/dont-ever-unload.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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 4498061..3715ba5 100644
--- a/fprintd.spec
+++ b/fprintd.spec
@@ -5,13 +5,12 @@
 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:	4
+Version:	0.4.1
+Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.bz2
-# Source0-md5:	d6f023e6560d5647eadf668cdbcee57a
-Patch0:		dont-ever-unload.patch
+# Source0-md5:	021844be151c0cb22d0c1624233b7780
 URL:		http://www.reactivated.net/fprint/wiki/Fprintd
 BuildRequires:	autoconf
 BuildRequires:	dbus-glib-devel
@@ -20,7 +19,7 @@ BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 2.0.0
 %{?with_apidocs:BuildRequires:  gtk-doc}
 BuildRequires:	intltool
-BuildRequires:	libfprint-devel >= 0.1.0
+BuildRequires:	libfprint-devel >= 0.4.0
 %{?with_apidocs:BuildRequires:	libxslt-progs}
 BuildRequires:	pam-devel
 BuildRequires:	perl-tools-pod
@@ -61,7 +60,6 @@ Moduł PAM do uwierzytelniania odciskiem palca.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
@@ -80,13 +78,15 @@ install -d $RPM_BUILD_ROOT/var/lib/fprint
 
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_fprintd.la
 
+%find_lang %{name}
+
 # to -devel, but we haven't any
 rm $RPM_BUILD_ROOT%{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.*.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README TODO
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fprintd.conf
-- 
2.43.0