rpms/fprintd/devel fprintd.spec, 1.15, 1.16 polkit1.patch, 1.1, 1.2 pam-module.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/fprintd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1039

Modified Files:
	fprintd.spec polkit1.patch 
Removed Files:
	pam-module.patch 
Log Message:
* Tue Jul 21 2009 Bastien Nocera <bnocera at redhat.com> 0.1-14.git04fd09cfa
- Merge polkit patch and fix for polkit patch


Index: fprintd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/fprintd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fprintd.spec	21 Jul 2009 12:48:02 -0000	1.15
+++ fprintd.spec	21 Jul 2009 14:02:07 -0000	1.16
@@ -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.b
 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 at redhat.com> 0.1-14.git04fd09cfa
+- Merge polkit patch and fix for polkit patch
+
 * Tue Jul 21 2009 Bastien Nocera <bnocera at redhat.com> 0.1-13.git04fd09cfa
 - Make the -devel package noarch (#507698)
 

polkit1.patch:
 configure.ac                                 |    5 -
 data/Makefile.am                             |    6 -
 data/net.reactivated.fprint.device.policy.in |    2 
 pam/Makefile.am                              |   10 +-
 src/device.c                                 |   92 +++++----------------------
 src/net.reactivated.Fprint.Device.xml        |   13 +++
 6 files changed, 41 insertions(+), 87 deletions(-)

Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/polkit1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- polkit1.patch	10 Jun 2009 00:14:14 -0000	1.1
+++ polkit1.patch	21 Jul 2009 14:02:07 -0000	1.2
@@ -68,7 +68,7 @@ diff -up fprintd-0.1/pam/Makefile.am.pol
 -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


--- pam-module.patch DELETED ---