rpms/gnome-keyring/devel gnome-keyring.spec, 1.41, 1.42 pam.patch, 1.1, 1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5397

Modified Files:
	gnome-keyring.spec pam.patch 
Log Message:
try again



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-keyring.spec	27 Jul 2007 20:02:29 -0000	1.41
+++ gnome-keyring.spec	27 Jul 2007 20:27:16 -0000	1.42
@@ -56,7 +56,7 @@
 
 %build
 autoreconf
-%configure --disable-gtk-doc
+%configure --disable-gtk-doc --with-pam-dir=/lib/security
 make %{?_smp_mflags}
 
 %install

pam.patch:

Index: pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam.patch	27 Jul 2007 20:02:29 -0000	1.1
+++ pam.patch	27 Jul 2007 20:27:16 -0000	1.2
@@ -1,6 +1,6 @@
 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
++++ gnome-keyring-2.19.6/pam/Makefile.am	2007-07-27 15:55:41.000000000 -0400
 @@ -17,9 +17,10 @@ pam_gnome_keyring_la_LIBADD = \
  pam_gnome_keyring_la_LDFLAGS = -module -avoid-version
  
@@ -17,14 +17,32 @@
  	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
++++ gnome-keyring-2.19.6/configure.in	2007-07-27 16:22:55.000000000 -0400
+@@ -236,18 +236,15 @@ if test "$enable_pam" != "no"; then
+ 	if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
+ 		AC_MSG_ERROR(The PAM headers are missing)
  	fi
+-	
+-	case "$host" in
+-	*-*-linux*)
+-		# See also <configure-flags> in pam_mount.xml.
+-	 	PAM_DEST_DIR="\$(prefix)/../lib/security"
+-		;;
+-	*)
+-		PAM_DEST_DIR="/usr/lib"
+-		;;
+-	esac
+-	AC_SUBST(PAM_DEST_DIR)
+-fi
++fi	
++
++AC_ARG_WITH ([pam-dir],
++             AC_HELP_STRING([--with-pam-dir=DIR],
++                            [directory to install pam modules in]),,
++             [with_pam_dir=/usr/lib])
++PAM_DEST_DIR="$with_pam_dir"
++AC_SUBST(PAM_DEST_DIR)
++  
  	
- 	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"
+ AM_CONDITIONAL(WITH_PAM, test "$have_pam" = "yes")
+