rpms/gnome-keyring/devel gnome-keyring.spec, 1.44, 1.45 pam.patch, 1.2, 1.3
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Fri Jul 27 22:35:26 UTC 2007
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3286
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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-keyring.spec 27 Jul 2007 20:53:17 -0000 1.44
+++ gnome-keyring.spec 27 Jul 2007 22:34:54 -0000 1.45
@@ -58,8 +58,9 @@
%patch0 -p1 -b .pam
%build
-libtoolize
-autoreconf
+aclocal
+automake
+autoconf
%configure --disable-gtk-doc --with-pam-dir=/lib/security
make %{?_smp_mflags}
pam.patch:
Index: pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/pam.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam.patch 27 Jul 2007 20:27:16 -0000 1.2
+++ pam.patch 27 Jul 2007 22:34:54 -0000 1.3
@@ -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:55:41.000000000 -0400
++++ gnome-keyring-2.19.6/pam/Makefile.am 2007-07-27 18:31:40.000000000 -0400
@@ -17,9 +17,10 @@ pam_gnome_keyring_la_LIBADD = \
pam_gnome_keyring_la_LDFLAGS = -module -avoid-version
@@ -17,7 +17,7 @@
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 16:22:55.000000000 -0400
++++ gnome-keyring-2.19.6/configure.in 2007-07-27 18:31:52.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)
@@ -36,10 +36,10 @@
-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])
++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)
+
More information about the scm-commits
mailing list