From 120d0bbbd34e3c52a0acc4b1e94c0bd786494289 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 27 Jul 2007 20:02:29 +0000
Subject: [PATCH] 2.19.6

---
 .cvsignore         |  2 +-
 gnome-keyring.spec | 33 ++++++++++++++++++++++++++++++---
 pam.patch          | 30 ++++++++++++++++++++++++++++++
 sources            |  2 +-
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 pam.patch

diff --git a/.cvsignore b/.cvsignore
index 7952fc8..abaa4f5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-keyring-2.19.5.tar.bz2
+gnome-keyring-2.19.6.tar.bz2
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 3703520..a988be4 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -2,11 +2,13 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.19.5
+Version: 2.19.6
 Release: 1%{?dist}
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.19/gnome-keyring-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=461045
+Patch0: pam.patch
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -35,17 +37,33 @@ The gnome-keyring-devel package contains the libraries and
 include files that you can use to develop applications that
 use gnome-keyring.
 
+%package pam
+Summary: A pam module for unlocking keyrings at login time
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+# for /lib/security
+Requires: pam
+
+%description pam
+The gnome-keyring-pam package contains a pam module that can
+automatically unlock the "login" keyring when the user logs in 
+and start the keyring daemon.
+
+
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1 -b .pam
 
 %build
+autoreconf
 %configure --disable-gtk-doc
 make %{?_smp_mflags}
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install install-pam DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/pam_gnome_keyring.so
 
 %find_lang gnome-keyring
 
@@ -71,7 +89,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_datadir}/gtk-doc/html/gnome-keyring/
 
+%files pam
+%defattr(-, root, root)
+/%{_lib}/security/*
+
+
 %changelog
+* Fri Jul 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.6-1
+- Update to 2.19.6
+- Add a pam subpackage
+
 * Mon Jul  9 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-1
 - Update to 2.19.5
 
diff --git a/pam.patch b/pam.patch
new file mode 100644
index 0000000..980a5e0
--- /dev/null
+++ b/pam.patch
@@ -0,0 +1,30 @@
+diff -up gnome-keyring-2.19.6/pam/Makefile.am.pam gnome-keyring-2.19.6/pam/Makefile.am
+--- gnome-keyring-2.19.6/pam/Makefile.am.pam	2007-07-21 22:01:42.000000000 -0400
++++ gnome-keyring-2.19.6/pam/Makefile.am	2007-07-27 15:53:39.000000000 -0400
+@@ -17,9 +17,10 @@ pam_gnome_keyring_la_LIBADD = \
+ pam_gnome_keyring_la_LDFLAGS = -module -avoid-version
+ 
+ install-pam: install
+-	cp $(DESTDIR)$(libdir)/pam_gnome_keyring.so $(PAM_DEST_DIR)/
+-	$(LN_S) -f pam_gnome_keyring.so $(PAM_DEST_DIR)/pam_gnome_keyring_auth.so
+-	$(LN_S) -f pam_gnome_keyring.so $(PAM_DEST_DIR)/pam_gnome_keyring_session.so
++	$(mkinstalldirs) $(DESTDIR)$(PAM_DEST_DIR)
++	cp $(DESTDIR)$(libdir)/pam_gnome_keyring.so $(DESTDIR)$(PAM_DEST_DIR)
++	pushd $(DESTDIR)$(PAM_DEST_DIR); $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so; popd
++	pushd $(DESTDIR)$(PAM_DEST_DIR); $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_session.so; popd
+ 	
+ uninstall-pam: 
+ 	rm -f $(PAM_DEST_DIR)/pam_gnome_keyring.so
+diff -up gnome-keyring-2.19.6/configure.in.pam gnome-keyring-2.19.6/configure.in
+--- gnome-keyring-2.19.6/configure.in.pam	2007-07-24 23:05:32.000000000 -0400
++++ gnome-keyring-2.19.6/configure.in	2007-07-27 15:50:47.000000000 -0400
+@@ -238,6 +238,9 @@ if test "$enable_pam" != "no"; then
+ 	fi
+ 	
+ 	case "$host" in
++	*-redhat-linux-gnu)
++		PAM_DEST_DIR="/lib/security"
++		;;
+ 	*-*-linux*)
+ 		# See also <configure-flags> in pam_mount.xml.
+ 	 	PAM_DEST_DIR="\$(prefix)/../lib/security"
diff --git a/sources b/sources
index 80c8ddc..4a211dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d32121817dc9a691d2ecc494ca888cb8  gnome-keyring-2.19.5.tar.bz2
+3fddd2cad893e57652ed0d7d7f894713  gnome-keyring-2.19.6.tar.bz2