From 60d5f82fca5ceb727cac9129da2b31f1389b6f05 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 4 Jun 2013 16:21:17 +0200
Subject: Add LIB64 var that will be set to lib64 on 64bit or lib on 32bit

---
 remote/modules/kdm/kdm.conf.zypper | 2 +-
 remote/modules/pam/pam.conf.zypper | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/kdm/kdm.conf.zypper b/remote/modules/kdm/kdm.conf.zypper
index a2266c52..081865b3 100644
--- a/remote/modules/kdm/kdm.conf.zypper
+++ b/remote/modules/kdm/kdm.conf.zypper
@@ -2,7 +2,7 @@ REQUIRED_INSTALLED_PACKAGES="kdm"
 REQUIRED_CONTENT_PACKAGES="kdm kde4-kgreeter-plugins"
 REQUIRED_BINARIES=""
 REQUIRED_DIRECTORIES="	/etc/dbus-1
-			/usr/lib/kde4
+			/usr/$LIB64/kde4
 			/usr/share/dbus-1
 			/usr/share/polkit-1
 			/usr/share/kde4/services
diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper
index 58f8bb46..2defe1bb 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.zypper
@@ -1,10 +1,10 @@
 REQUIRED_INSTALLED_PACKAGES=" pam_ldap pam pam-devel nss_ldap pam-modules"
 REQUIRED_CONTENT_PACKAGES="	pam_ldap pam pam-devel nss_ldap pam-modules nss-mdns"
 REQUIRED_BINARIES="	mkhomedir_helper"
-REQUIRED_DIRECTORIES="	/lib
-			/usr/lib
+REQUIRED_DIRECTORIES="	/$LIB64
+			/usr/$LIB64
 			/etc/security"
 REQUIRED_SYSTEM_FILES=" /etc/login.defs
                         /etc/securetty
-                        /lib/security"
+                        /$LIB64/security"
 
-- 
cgit v1.2.3-55-g7522


From 32a7b056f4e3f3031aacbde905a1ee096b40acf3 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 4 Jun 2013 17:56:29 +0200
Subject: Changed: hardcoded /lib-paths changed to variable 	 LIB64 (=lib,
 =lib64 on 64bit systems)

---
 remote/modules/policykit/policykit.conf.zypper | 3 +--
 remote/modules/rsyslogd/rsyslogd.conf          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/policykit/policykit.conf.zypper b/remote/modules/policykit/policykit.conf.zypper
index 87c0014e..c93181c5 100644
--- a/remote/modules/policykit/policykit.conf.zypper
+++ b/remote/modules/policykit/policykit.conf.zypper
@@ -5,7 +5,6 @@ REQUIRED_DIRECTORIES="	/etc/pam.d /etc/dbus-1 /etc/polkit-1
 			/usr/bin 
 			/usr/share/dbus-1
 			/usr/share/polkit-1
-			/usr/lib/polkit-1
-			/usr${ARCH_LIB_DIR}/polkit-1"
+			/usr/lib/polkit-1"
 REQUIRED_FILES=""
 REQUIRED_LIBRARIES="libmozjs185"
diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf
index d0d46e77..f5d60989 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf
+++ b/remote/modules/rsyslogd/rsyslogd.conf
@@ -1,4 +1,4 @@
 REQUIRED_CONTENT_PACKAGES="	rsyslog"
 REQUIRED_BINARIES="	rsyslogd"
 REQUIRED_FILES="	/etc/rsyslog.conf"
-REQUIRED_DIRECTORIES="	/usr/lib/rsyslog"
+REQUIRED_DIRECTORIES="	/usr/$LIB64/rsyslog"
-- 
cgit v1.2.3-55-g7522