From 287aead68e817227195f50c201bfa6cd8d285e59 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Tue, 3 Jun 2008 16:09:08 +0000 Subject: [PATCH] More changes to remove dependency on Java 1.5. Updated the spec file to include license information for all of the packages. --- .../server-java/Jaas/linux/client_keystore_setup.sh | 2 +- .../server-java/package/linux/CASA_auth_token_svc.spec.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh b/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh index 5da21d31..aaa24dc4 100755 --- a/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh +++ b/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh @@ -47,7 +47,7 @@ else LIB=lib fi -JAVA_HOME=/usr/$LIB/jvm/jre-1.5.0 +JAVA_HOME=/usr/$LIB/jvm/jre KEYTOOL_PATH=$JAVA_HOME/bin/keytool KEYSTORE_PATH=/etc/CASA/authtoken/keys/trusted-ats-jks-store LOCAL_ATS_SIGNING_CERT_PATH=/etc/CASA/authtoken/keys/localSigningCert diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in index 213cc032..922f0d06 100644 --- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in +++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in @@ -16,7 +16,7 @@ Name: @PACKAGE@ -URL: http://www.novell.com/products +Url: http://www.novell.com/products BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 xml-commons-apis BuildRequires: CASA-devel curl jakarta-commons-logging java-sdk-1.5.0 log4j pwdutils update-alternatives %if %suse_version < 1030 @@ -72,6 +72,7 @@ tokens that can later be used by applications to authenticate the entity or services that are CASA authentication enabled. %package -n CASA_auth_token_jaas_support +License: LGPL v2.1 or later Summary: Novell CASA Authentication Token JAAS Support Components Group: Applications/System Requires: jre >= 1.5.0