From 77c46bae1bc8aa0ea717710495c4ccf06ce01085 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 21 May 2013 17:59:10 +0200
Subject: 1. Fix ARCH_TRIPLET for distos that don'T have it. 2. Add
 suse-specific .conf file for openbox 3. Add libnss_mdns* to pam 4. Add
 vmchooser and openbox to stage32-opensuse

---
 remote/modules/openbox/openbox.build           | 4 +++-
 remote/modules/openbox/openbox.conf            | 7 +++----
 remote/modules/openbox/openbox.conf.zypper     | 5 +++++
 remote/modules/pam/pam.conf.zypper             | 2 +-
 remote/modules/vmchooser/vmchooser.conf.zypper | 5 +++++
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 remote/modules/openbox/openbox.conf.zypper
 create mode 100644 remote/modules/vmchooser/vmchooser.conf.zypper

(limited to 'remote/modules')

diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build
index 3e56fbfb..51c6beec 100644
--- a/remote/modules/openbox/openbox.build
+++ b/remote/modules/openbox/openbox.build
@@ -7,7 +7,9 @@ build() {
 	[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
 	list_packet_files >> "$COPYLIST"
-	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+	# FIXME: Hack: openSUSE's rpm -ql lilsts non-existant pango.modules, which makes
+	# tarcopy fail. We probably can't fix that, so remove it using grep....
+	tarcopy "$(cat "$COPYLIST" | grep -v 'pango\.modules$' | sort -u)" "${MODULE_BUILD_DIR}"
 
 	return 0
 }
diff --git a/remote/modules/openbox/openbox.conf b/remote/modules/openbox/openbox.conf
index f7d09947..2dc5da54 100644
--- a/remote/modules/openbox/openbox.conf
+++ b/remote/modules/openbox/openbox.conf
@@ -6,7 +6,6 @@ REQUIRED_BINARIES="	openbox
 			openbox-session"
 REQUIRED_FILES="	/usr/share/xsessions/openbox.desktop"	
 REQUIRED_DIRECTORIES="	/etc
-			/usr/lib/openbox
-			/usr/share/themes/Clearlooks
-			/usr/lib/$ARCH_TRIPLET/pango/"
-			
+			/usr/lib
+			/usr/share/themes/Clearlooks"
+
diff --git a/remote/modules/openbox/openbox.conf.zypper b/remote/modules/openbox/openbox.conf.zypper
new file mode 100644
index 00000000..63e5e25d
--- /dev/null
+++ b/remote/modules/openbox/openbox.conf.zypper
@@ -0,0 +1,5 @@
+REQUIRED_INSTALLED_PACKAGES=" openbox
+			libpango-1_0-0"
+REQUIRED_CONTENT_PACKAGES="	openbox
+			libpango-1_0-0"
+
diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper
index bdabe4a4..191850db 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.zypper
@@ -1,5 +1,5 @@
 REQUIRED_INSTALLED_PACKAGES=" pam_ldap pam pam-devel nss_ldap pam-modules"
-REQUIRED_CONTENT_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_DIRECTORIES="	/lib
 			/usr/lib
 			/etc/security"
diff --git a/remote/modules/vmchooser/vmchooser.conf.zypper b/remote/modules/vmchooser/vmchooser.conf.zypper
new file mode 100644
index 00000000..ca9944af
--- /dev/null
+++ b/remote/modules/vmchooser/vmchooser.conf.zypper
@@ -0,0 +1,5 @@
+GIT=git://git.openslx.org/openslx/tools/vmchooser.git
+REQUIRED_INSTALLED_PACKAGES="	cmake
+			libqt4-devel"
+PREFIX="/opt/openslx/bin"
+REQUIRED_BINARIES="vmchooser"
-- 
cgit v1.2.3-55-g7522