From d32c8e0121d9ba39f7e07af610eba224c193585a Mon Sep 17 00:00:00 2001 From: Rene Rebe <rene.rebe@gmx.net> Date: Tue, 2 Mar 2004 20:18:33 +0000 Subject: [PATCH] merged old pam fixes from kde31 and applied some kde32 adaptions (untested) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2438 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kde/kdeadmin/libtool-fix.patch | 23 +++++++++++++++++++++++ package/kde/kdeadmin/pam-fix.patch | 16 ++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 package/kde/kdeadmin/libtool-fix.patch create mode 100644 package/kde/kdeadmin/pam-fix.patch diff --git a/package/kde/kdeadmin/libtool-fix.patch b/package/kde/kdeadmin/libtool-fix.patch new file mode 100644 index 000000000..68c8af61c --- /dev/null +++ b/package/kde/kdeadmin/libtool-fix.patch @@ -0,0 +1,23 @@ + +A tiny "hack" for our /lib vs. /usr/lib situation. Too damn kde* uses an +own copy of libtool - we need to verify how the official GNU beast behaves +and maybe really fix that one. + + - Rene Rebe <rene@rocklinux.org> + +--- kdeadmin-3.1.4/admin/ltmain.sh.orig 2003-12-03 16:30:02.000000000 +0100 ++++ kdeadmin-3.1.4/admin/ltmain.sh 2003-12-03 16:30:56.000000000 +0100 +@@ -1963,9 +1963,12 @@ + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" +- else ++ elif test -f "$libdir/$linklib" ; then + dir="$libdir" + absdir="$libdir" ++ else ++ dir="/lib" ++ absdir="/lib" + fi + else + dir="$ladir/$objdir" diff --git a/package/kde/kdeadmin/pam-fix.patch b/package/kde/kdeadmin/pam-fix.patch new file mode 100644 index 000000000..0b5045f77 --- /dev/null +++ b/package/kde/kdeadmin/pam-fix.patch @@ -0,0 +1,16 @@ + +We need libpam and libpam_misc for kuser. + + - Rene Rebe <rene@rocklinux.org> + +--- kdeadmin-3.2.0/configure.orig 2004-03-02 20:58:16.000000000 +0100 ++++ kdeadmin-3.2.0/configure 2004-03-02 21:02:41.000000000 +0100 +@@ -30703,7 +30703,7 @@ + #define HAVE_PAM 1 + _ACEOF + +- PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL" ++ PAMLIBS="$PAM_MISC_LIB -lpam -lpam_misc $LIBDL" + use_pam=yes + + if test "$pam_header" = "pam/pam_appl.h"; then