rpms/gnome-keyring
5
0
Fork 0
Code Issues Pull Requests Releases Activity

try again

Browse Source
This commit is contained in:
Matthias Clasen 2007-07-27 22:34:54 +00:00
parent 8958822aa7
commit 6905355136
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnome-keyring.spec
View File

@ -58,8 +58,9 @@ and start the keyring daemon.
%patch0 -p1 -b .pam %patch0 -p1 -b .pam
%build %build
libtoolize aclocal
autoreconf automake
autoconf
%configure --disable-gtk-doc --with-pam-dir=/lib/security %configure --disable-gtk-doc --with-pam-dir=/lib/security
make %{?_smp_mflags} make %{?_smp_mflags}

12
pam.patch
View File

@ -1,6 +1,6 @@
diff -up gnome-keyring-2.19.6/pam/Makefile.am.pam gnome-keyring-2.19.6/pam/Makefile.am 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.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 = \ @@ -17,9 +17,10 @@ pam_gnome_keyring_la_LIBADD = \
pam_gnome_keyring_la_LDFLAGS = -module -avoid-version pam_gnome_keyring_la_LDFLAGS = -module -avoid-version
@ -17,7 +17,7 @@ diff -up gnome-keyring-2.19.6/pam/Makefile.am.pam gnome-keyring-2.19.6/pam/Makef
rm -f $(PAM_DEST_DIR)/pam_gnome_keyring.so 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 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.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 @@ -236,18 +236,15 @@ if test "$enable_pam" != "no"; then
if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
AC_MSG_ERROR(The PAM headers are missing) AC_MSG_ERROR(The PAM headers are missing)
@ -36,10 +36,10 @@ diff -up gnome-keyring-2.19.6/configure.in.pam gnome-keyring-2.19.6/configure.in
-fi -fi
+fi +fi
+ +
+AC_ARG_WITH ([pam-dir], +AC_ARG_WITH([pam-dir],
+ AC_HELP_STRING([--with-pam-dir=DIR], + [AC_HELP_STRING([--with-pam-dir=DIR],
+ [directory to install pam modules in]),, + [directory to install pam modules in])],
+ [with_pam_dir=/usr/lib]) + [], [with_pam_dir="/usr/lib"])
+PAM_DEST_DIR="$with_pam_dir" +PAM_DEST_DIR="$with_pam_dir"
+AC_SUBST(PAM_DEST_DIR) +AC_SUBST(PAM_DEST_DIR)
+ +