From 6525dfb8b9b08530acc084c1155db1107d027961 Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 15 Jun 2007 17:04:55 +0000 Subject: [PATCH] Fix Bad Java --- .../app-admin/novell-novlc1/ChangeLog | 4 + .../app-admin/novell-novlc1/Manifest | 31 +++--- .../novell-novlc1/files/novell-novlc1-1.3.6 | 29 +---- .../novell-novlc1-1.3.6_p1-r4.ebuild | 2 +- .../novell-novlc1-1.3.6_p1-r5.ebuild | 100 ++++++++++++++++++ 5 files changed, 126 insertions(+), 40 deletions(-) create mode 100644 trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r5.ebuild diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/ChangeLog b/trunk/novell4gentoo/app-admin/novell-novlc1/ChangeLog index b78e940..8115bfd 100644 --- a/trunk/novell4gentoo/app-admin/novell-novlc1/ChangeLog +++ b/trunk/novell4gentoo/app-admin/novell-novlc1/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Jun 2007; Mario Fetka files/novell-novlc1-1.3.6, + novell-novlc1-1.3.6_p1-r4.ebuild, +novell-novlc1-1.3.6_p1-r5.ebuild: + Fix bad Java Client not finding jclient,jar + 04 Apr 2007; Mario Fetka -novell-novlc1-1.3.6_p1.ebuild, -novell-novlc1-1.3.6_p1-r1.ebuild, -novell-novlc1-1.3.6_p1-r2.ebuild: diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest b/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest index d92cb9c..1bb5541 100644 --- a/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest +++ b/trunk/novell4gentoo/app-admin/novell-novlc1/Manifest @@ -1,20 +1,24 @@ -AUX novell-novlc1-1.3.6 839 RMD160 b428e61fc2550d3818424a4e3c24710636951295 SHA1 897333bffe779d65b6a8b02687d995e42fc8e3a7 SHA256 48cd25e29d831e1daa083bad92af80b9fdc91f804ac613ac780d3a1f082a1d7b -MD5 3c7b107d963df67c7deea293c084b8a1 files/novell-novlc1-1.3.6 839 -RMD160 b428e61fc2550d3818424a4e3c24710636951295 files/novell-novlc1-1.3.6 839 -SHA256 48cd25e29d831e1daa083bad92af80b9fdc91f804ac613ac780d3a1f082a1d7b files/novell-novlc1-1.3.6 839 +AUX novell-novlc1-1.3.6 136 RMD160 95d10220c79733c18a26e3f9d9ac10ec210c3c7f SHA1 a06edc9a8c5a762d90b0515be3f502fe7166e412 SHA256 c7167438951559c40c7ded0199c7621518b7a4d0e93fedadaafa2f50042aec98 +MD5 a016ed9155148e12f1bf3e53ac440911 files/novell-novlc1-1.3.6 136 +RMD160 95d10220c79733c18a26e3f9d9ac10ec210c3c7f files/novell-novlc1-1.3.6 136 +SHA256 c7167438951559c40c7ded0199c7621518b7a4d0e93fedadaafa2f50042aec98 files/novell-novlc1-1.3.6 136 DIST c1_136f-linux.tar.gz 39985363 RMD160 f6a18cd0c9802c41ae35fb587e08f807776de92f SHA1 f592a1022fc6d64391b0c7dd7d6b2adb6ad5ad16 SHA256 1263d8e3610719d9f353ac43501b596bfcef126c24f749af8cee1247148927a9 EBUILD novell-novlc1-1.3.6_p1-r3.ebuild 3467 RMD160 36af3ec3cb9c3c780f017de99ed11d165b673b88 SHA1 0d6491b090ee6c3e8d430f011251fa0919daea93 SHA256 85710a6ba33afb19a4e4f3e5542e206f98db4487f2dd8f1f2766f5f565a4c452 MD5 5d0dc652ec7578a70ce7da74e535e0b8 novell-novlc1-1.3.6_p1-r3.ebuild 3467 RMD160 36af3ec3cb9c3c780f017de99ed11d165b673b88 novell-novlc1-1.3.6_p1-r3.ebuild 3467 SHA256 85710a6ba33afb19a4e4f3e5542e206f98db4487f2dd8f1f2766f5f565a4c452 novell-novlc1-1.3.6_p1-r3.ebuild 3467 -EBUILD novell-novlc1-1.3.6_p1-r4.ebuild 4081 RMD160 688f55292ecc0d9ee2833b3a24e9880631d3f4e4 SHA1 4578790be8edcce155be7a180bd6e0bc71b312aa SHA256 e421baea182fe2fe2833b657dd6907d86d7c12c48f9359d439969576db9053d0 -MD5 982ab3bea4d408339d2e64137cbc887c novell-novlc1-1.3.6_p1-r4.ebuild 4081 -RMD160 688f55292ecc0d9ee2833b3a24e9880631d3f4e4 novell-novlc1-1.3.6_p1-r4.ebuild 4081 -SHA256 e421baea182fe2fe2833b657dd6907d86d7c12c48f9359d439969576db9053d0 novell-novlc1-1.3.6_p1-r4.ebuild 4081 -MISC ChangeLog 871 RMD160 dce3eb9c9e403795af489d97966e35e666288404 SHA1 a27ce02da7b6fe1cbc0736c02e3c7ff763e24d4b SHA256 dc9e3d41e43ffed0b601b0f603c4e30a30de991f5f58a74c4ebc975d8c45ca54 -MD5 cb2c4ebf413a4093b7618305427a363b ChangeLog 871 -RMD160 dce3eb9c9e403795af489d97966e35e666288404 ChangeLog 871 -SHA256 dc9e3d41e43ffed0b601b0f603c4e30a30de991f5f58a74c4ebc975d8c45ca54 ChangeLog 871 +EBUILD novell-novlc1-1.3.6_p1-r4.ebuild 4093 RMD160 7feead13593e7ce54408b1bbdc804fa8a5364846 SHA1 0f63c9ed54a9a0ca9db65d43d6a2ddd55070c332 SHA256 e3554233c2987539e24c052a31a49889c75a1144042f5921e048726f7630df60 +MD5 ffd2b32deae1bf83bb0d5b3f4cab44d7 novell-novlc1-1.3.6_p1-r4.ebuild 4093 +RMD160 7feead13593e7ce54408b1bbdc804fa8a5364846 novell-novlc1-1.3.6_p1-r4.ebuild 4093 +SHA256 e3554233c2987539e24c052a31a49889c75a1144042f5921e048726f7630df60 novell-novlc1-1.3.6_p1-r4.ebuild 4093 +EBUILD novell-novlc1-1.3.6_p1-r5.ebuild 4190 RMD160 f4facd96b3e598d97dd194f47fa8353c17ffea71 SHA1 3ec06fb2c74061b9e1fd757e81816cdb973e343a SHA256 74de8453720a155f83d03113942ef31d6fb6ae674101011d0360a4f241175e88 +MD5 f48dd3ea771cdfef919cc3b5b32f0268 novell-novlc1-1.3.6_p1-r5.ebuild 4190 +RMD160 f4facd96b3e598d97dd194f47fa8353c17ffea71 novell-novlc1-1.3.6_p1-r5.ebuild 4190 +SHA256 74de8453720a155f83d03113942ef31d6fb6ae674101011d0360a4f241175e88 novell-novlc1-1.3.6_p1-r5.ebuild 4190 +MISC ChangeLog 1064 RMD160 a375ee6b3ea90b98acb86eda18b45d1e75f1d86e SHA1 ac138860564325df57995c03673d8319d40ad2bc SHA256 b8700088139978a2b58cda6c6288e0f80629e5c86c463b93791725c9d009af19 +MD5 3f0d3ebee33a314c18400859acf4f776 ChangeLog 1064 +RMD160 a375ee6b3ea90b98acb86eda18b45d1e75f1d86e ChangeLog 1064 +SHA256 b8700088139978a2b58cda6c6288e0f80629e5c86c463b93791725c9d009af19 ChangeLog 1064 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 @@ -25,3 +29,6 @@ SHA256 cbd3ff4d7cff845a6c8d6cc774c759679c678796c839e423f72d19ef5d6830b8 files/di MD5 a4084ce2723c1a3ccc2f7000a4d3043a files/digest-novell-novlc1-1.3.6_p1-r4 247 RMD160 c3e583a3699abd86e770a9e27b5bee7553fa2e75 files/digest-novell-novlc1-1.3.6_p1-r4 247 SHA256 cbd3ff4d7cff845a6c8d6cc774c759679c678796c839e423f72d19ef5d6830b8 files/digest-novell-novlc1-1.3.6_p1-r4 247 +MD5 a4084ce2723c1a3ccc2f7000a4d3043a files/digest-novell-novlc1-1.3.6_p1-r5 247 +RMD160 c3e583a3699abd86e770a9e27b5bee7553fa2e75 files/digest-novell-novlc1-1.3.6_p1-r5 247 +SHA256 cbd3ff4d7cff845a6c8d6cc774c759679c678796c839e423f72d19ef5d6830b8 files/digest-novell-novlc1-1.3.6_p1-r5 247 diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/files/novell-novlc1-1.3.6 b/trunk/novell4gentoo/app-admin/novell-novlc1/files/novell-novlc1-1.3.6 index 80fbe07..570744e 100755 --- a/trunk/novell4gentoo/app-admin/novell-novlc1/files/novell-novlc1-1.3.6 +++ b/trunk/novell4gentoo/app-admin/novell-novlc1/files/novell-novlc1-1.3.6 @@ -1,29 +1,4 @@ -# Get Classpath -unset classpath -classpath="$classpath:$APPHOME/ConsoleOne.jar" -classpath="$classpath:$APPHOME/ConsoleOneCore.jar" -classpath="$classpath:$APPHOME/help" -classpath="$classpath:/usr/lib/jclient.jar" -classpath="$classpath:/opt/novell/eDirectory/lib/jclient.jar" -classpath="$classpath:/opt/NOVLn4u/lib/jclient.jar" -# BEGIN TEMP -classpath="$classpath:/usr/lib/dirxml/classes/jclient.jar" -classpath="$classpath:/opt/NOVLn4u/dirxml/classes/jclient.jar" -# END TEMP -for jar in $APPHOME/ConsoleOneExt/*.jar; do - classpath="$classpath:$jar" -done -classpath="$classpath:$CLASSPATH" - -prog="${jre}/bin/java" - -# Run. -if [ -x "$prog" ] -then - $prog -noverify -Dapplication.home="${APPHOME}" -classpath "$classpath" com.novell.application.console.shell.Console "$@" -else - echo >&2 "$progname was not found in ${prog}" - exit 1 -fi +LD_LIBRARY_PATH="/usr/ConsoleOne/usr/lib:/usr/lib:/opt/novell/lib:/opt/novell/eDirectory/lib:$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r4.ebuild b/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r4.ebuild index 93d4445..54ccb5c 100644 --- a/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r4.ebuild +++ b/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r4.ebuild @@ -85,7 +85,7 @@ src_install() { insinto /usr/ConsoleOne/help doins -r ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/help/* java-pkg_dolauncher ConsoleOne --pkg_args "-libpath=/usr/ConsoleOne/ConsoleOneExt -prefdir=user.home" \ - --java_args -Dapplication.home=/usr/ConsoleOne \ + --java_args "-Dapplication.home=/usr/ConsoleOne -noverify" \ --main com.novell.application.console.shell.Console # insinto /usr/ConsoleOne/bin diff --git a/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r5.ebuild b/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r5.ebuild new file mode 100644 index 0000000..4d9f435 --- /dev/null +++ b/trunk/novell4gentoo/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r5.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils rpm java-utils-2 + +MY_PV="${PV/_p/-}" + +DESCRIPTION="Novell ConsoleOne" +HOMEPAGE="http://www.novell.com" +SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/brBWU2uxSiM~/c1_136f-linux.tar.gz" + +LICENSE="Novell-eDir-87" +SLOT="0" +KEYWORDS="~x86" +IUSE="linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_pt linguas_ru linguas_zh_CN linguas_zh_TW" + +DEPEND=">=net-nds/novell-ndsbase-8.7.3.7_p38 + >=net-nds/novell-novlsas-8.7.3_p34 + >=app-crypt/novell-npkiapi-2.7.0_p6" + +RDEPEND="virtual/libc + >=virtual/jdk-1.4 + >=dev-java/java-config-2 + >=net-nds/novell-ndsbase-8.7.3.7_p38 + >=net-nds/novell-ndscommon-8.7.3_p34 + >=net-nds/novell-nldapbase-8.7.3_p34 + >=net-nds/novell-nldapsdk-8.7.3_p34 + >=net-nds/novell-novlice-8.7.3_p34 + >=net-nds/novell-novllmgnt-8.7.3_p34 + >=net-nds/novell-novlsas-8.7.3_p34 + >=net-nds/novell-novlxis-8.7.3_p34 + >=app-crypt/novell-npkit-2.7.0_p6 + >=app-crypt/novell-npkiapi-2.7.0_p6 + >=app-crypt/novell-pkiserver-2.7.0_p6 + !net-nds/novell-novlc1" + +RESTRICT="nomirror nostrip" + +src_unpack() { + unpack ${A} + mkdir -p ${WORKDIR}/${PN}-${MY_PV} + cd ${PN}-${MY_PV} + rpm_unpack ${WORKDIR}/Linux/NOVLc1-${MY_PV}.i386.rpm + use linguas_de && rpm_unpack ${WORKDIR}/Linux/NOVLc1_de-${MY_PV}.i386.rpm + use linguas_es && rpm_unpack ${WORKDIR}/Linux/NOVLc1_es-${MY_PV}.i386.rpm + use linguas_fr && rpm_unpack ${WORKDIR}/Linux/NOVLc1_fr-${MY_PV}.i386.rpm + use linguas_it && rpm_unpack ${WORKDIR}/Linux/NOVLc1_it-${MY_PV}.i386.rpm + use linguas_ja && rpm_unpack ${WORKDIR}/Linux/NOVLc1_ja-${MY_PV}.i386.rpm + use linguas_pt && rpm_unpack ${WORKDIR}/Linux/NOVLc1_pt-${MY_PV}.i386.rpm + use linguas_ru && rpm_unpack ${WORKDIR}/Linux/NOVLc1_ru-${MY_PV}.i386.rpm + use linguas_zh_CN && rpm_unpack ${WORKDIR}/Linux/NOVLc1_zh_CN-${MY_PV}.i386.rpm + use linguas_zh_TW && rpm_unpack ${WORKDIR}/Linux/NOVLc1_zh_TW-${MY_PV}.i386.rpm + java-pkg_jar-from novell-ndsbase jclient.jar + java-pkg_jar-from novell-npkiapi npki.jar + java-pkg_jar-from novell-novlsas nssl.jar + java-pkg_jar-from novell-novlsas jssl.jar + java-pkg_addcp /usr/ConsoleOne/help + java-pkg_addcp /usr/lib + java-pkg_addcp /usr/ConsoleOne/lib +} + +src_compile() { :; } + +src_install() { + java-pkg_jarinto /usr/ConsoleOne + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/*.jar + java-pkg_jarinto /usr/ConsoleOne/ConsoleOneExt + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/ConsoleOneExt/*.jar + java-pkg_jarinto /usr/ConsoleOne/lib/core + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/lib/core/*.jar + java-pkg_jarinto /usr/ConsoleOne/lib/mach + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/lib/mach/*.jar + java-pkg_jarinto /usr/ConsoleOne/resources/core + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/resources/core/*.jar + java-pkg_jarinto /usr/ConsoleOne/resources/mach + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/resources/mach/*.jar + java-pkg_jarinto /usr/ConsoleOne/resources/widgets + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/resources/widgets/*.jar + java-pkg_jarinto /usr/ConsoleOne/snapins/core + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/snapins/core/*.jar + java-pkg_jarinto /usr/ConsoleOne/snapins/mach + java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/snapins/mach/*.jar + into /usr/ConsoleOne + #dobin ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/bin/* + #dosed 's%$APPHOME/jre%`java-config --jre-home`%' /usr/ConsoleOne/bin/ConsoleOne + insinto /usr/ConsoleOne/help + doins -r ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/help/* + java-pkg_dolauncher ConsoleOne --pkg_args "-libpath=/usr/ConsoleOne/ConsoleOneExt -prefdir=user.home" \ + --java_args "-Dapplication.home=/usr/ConsoleOne -noverify" \ + --main com.novell.application.console.shell.Console \ + --pre ${FILESDIR}/${P} + +# insinto /usr/ConsoleOne/bin + doicon ${WORKDIR}/Linux/ConsoleOneIcon.png + + insinto /usr/share/applications + doins ${WORKDIR}/Linux/consoleone.desktop + dosed 's%/usr/ConsoleOne/bin/ConsoleOneIcon.png%ConsoleOneIcon.png%' /usr/share/applications/consoleone.desktop +} \ No newline at end of file