- Merge polkit patch and fix for polkit patch

This commit is contained in:
Bastien Nocera 2009-07-21 14:02:07 +00:00
parent 784e43dddc
commit 4c4bbdfc41
3 changed files with 5 additions and 16 deletions

View File

@ -3,7 +3,7 @@
Name: fprintd
Version: 0.1
Release: 13.git%{short_hash}%{?dist}
Release: 14.git%{short_hash}%{?dist}
Summary: D-Bus service for Fingerprint reader access
Group: System Environment/Daemons
@ -17,7 +17,6 @@ Source0: fprintd-0.1-%{short_hash}.tar.bz2
Patch1: 0001-Detect-when-a-device-is-disconnected.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=498368
Patch2: polkit1.patch
Patch3: pam-module.patch
Url: http://www.reactivated.net/fprint/wiki/Fprintd
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: s390 s390x
@ -64,7 +63,6 @@ fingerprint readers access.
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1 -b .polkit1
%patch3 -p1 -b .pam-module
autoreconf -i -f
@ -107,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
%changelog
* 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)

View File

@ -1,12 +0,0 @@
diff -up fprintd-0.1/pam/Makefile.am.pam fprintd-0.1/pam/Makefile.am
--- fprintd-0.1/pam/Makefile.am.pam 2009-07-09 00:08:40.474479777 -0400
+++ fprintd-0.1/pam/Makefile.am 2009-07-09 00:08:17.307483156 -0400
@@ -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 = -module
+pam_fprintd_la_LDFLAGS = -avoid-version -module
pam_fprintd_la_LIBADD = $(PAM_LIBS) $(GLIB_LIBS)
MARSHALFILES = marshal.c marshal.h

View File

@ -68,7 +68,7 @@ diff -up fprintd-0.1/pam/Makefile.am.polkit1 fprintd-0.1/pam/Makefile.am
-pam_fprintd_so_LDADD = $(PAM_LIBS) $(GLIB_LIBS)
+pam_fprintd_la_SOURCES = pam_fprintd.c $(MARSHALFILES)
+pam_fprintd_la_CFLAGS = -fPIC $(WARN_CFLAGS) $(GLIB_CFLAGS)
+pam_fprintd_la_LDFLAGS = -module
+pam_fprintd_la_LDFLAGS = -avoid-version -module
+pam_fprintd_la_LIBADD = $(PAM_LIBS) $(GLIB_LIBS)
MARSHALFILES = marshal.c marshal.h