diff options
| author | Michael Neves | 2013-05-23 17:01:04 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-05-23 17:01:04 +0200 |
| commit | 655b2494fc7d8fec3a5f6212bbb7a88cbe5c13f7 (patch) | |
| tree | 26e62638af3ae641fe0e561ba3ee19bdbb71e484 /remote/modules/openbox | |
| parent | [SUSE] vmchooser xml now found in correct dir (diff) | |
| parent | fix PATH for debug shell (diff) | |
| download | tm-scripts-655b2494fc7d8fec3a5f6212bbb7a88cbe5c13f7.tar.gz tm-scripts-655b2494fc7d8fec3a5f6212bbb7a88cbe5c13f7.tar.xz tm-scripts-655b2494fc7d8fec3a5f6212bbb7a88cbe5c13f7.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/openbox')
| -rw-r--r-- | remote/modules/openbox/openbox.build | 4 | ||||
| -rw-r--r-- | remote/modules/openbox/openbox.conf | 11 | ||||
| -rw-r--r-- | remote/modules/openbox/openbox.conf.zypper | 5 |
3 files changed, 13 insertions, 7 deletions
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 67c63c4c..2dc5da54 100644 --- a/remote/modules/openbox/openbox.conf +++ b/remote/modules/openbox/openbox.conf @@ -1,12 +1,11 @@ -REQUIRED_DEPENDENCIES=" openbox +REQUIRED_INSTALLED_PACKAGES=" openbox libpango1.0-0" -REQUIRED_PACKAGES=" openbox +REQUIRED_CONTENT_PACKAGES=" openbox libpango1.0-0" 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" + |