From 7a1eec39e5d0c7df33ef6e548830e355d0ca4908 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Thu, 29 May 2008 20:37:23 +0000 Subject: [PATCH] Yast module spec files changes so that we stop including our icons as part of our yast packages since the icons are now part of the openSUSE themes. CASA-auth-token-svc changes are to allow the package to install and run under openSUSE11. --- CASA-auth-token/server-java/Svc/linux/envvars | 12 ++++++---- .../Svc/linux/refresh_trusted_ats_keystore.sh | 2 +- .../package/linux/CASA_auth_token_svc.changes | 10 ++++++++ .../package/linux/CASA_auth_token_svc.spec.in | 23 +++++++++++++------ .../yast2-casa-ats/yast2-casa-ats.spec.in | 2 ++ yast2-CASA/yast2-CASA.spec.in | 2 ++ 6 files changed, 39 insertions(+), 12 deletions(-) diff --git a/CASA-auth-token/server-java/Svc/linux/envvars b/CASA-auth-token/server-java/Svc/linux/envvars index 84e8ca53..08b0abe0 100644 --- a/CASA-auth-token/server-java/Svc/linux/envvars +++ b/CASA-auth-token/server-java/Svc/linux/envvars @@ -14,14 +14,18 @@ else LIB=lib fi -JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0" +JAVA_HOME="/usr/$LIB/jvm/jre" CATALINA_BASE="/srv/www/casaats" -if [ -d /usr/share/tomcat55 ]; then - CATALINA_HOME="/usr/share/tomcat55" +if [ -d /usr/share/tomcat6 ]; then + CATALINA_HOME="/usr/share/tomcat6" else - CATALINA_HOME="/usr/share/tomcat5" + if [ -d /usr/share/tomcat55 ]; then + CATALINA_HOME="/usr/share/tomcat55" + else + CATALINA_HOME="/usr/share/tomcat5" + fi fi CATALINA_PID="/var/lib/CASA/authtoken/svc/casaatsd.pid" diff --git a/CASA-auth-token/server-java/Svc/linux/refresh_trusted_ats_keystore.sh b/CASA-auth-token/server-java/Svc/linux/refresh_trusted_ats_keystore.sh index 027fd066..182ef271 100755 --- a/CASA-auth-token/server-java/Svc/linux/refresh_trusted_ats_keystore.sh +++ b/CASA-auth-token/server-java/Svc/linux/refresh_trusted_ats_keystore.sh @@ -40,7 +40,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.changes b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes index dca2c4fe..f9c71566 100644 --- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes +++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes @@ -13,6 +13,16 @@ Mon Jan 28 13:19:43 MST 2008 - jluciani@novell.com allow for extended characters in the file. This addresses BUG 338574. +------------------------------------------------------------------- +Wed Jan 30 02:06:58 CET 2008 - ro@suse.de + +- fix tomcat requires as well + +------------------------------------------------------------------- +Sat Jan 26 11:55:41 CET 2008 - coolo@suse.de + +- build against tomcat6 + ------------------------------------------------------------------- Thu Aug 9 10:19:43 MDT 2007 - jluciani@novell.com 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 0cc8cdb3..213cc032 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 @@ -18,14 +18,19 @@ Name: @PACKAGE@ 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: java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel curl +BuildRequires: CASA-devel curl jakarta-commons-logging java-sdk-1.5.0 log4j pwdutils update-alternatives %if %suse_version < 1030 -BuildRequires: tomcat5 +BuildRequires: tomcat5 %else -BuildRequires: tomcat55 +%if %suse_version > 1030 +BuildRequires: tomcat6 +%else +BuildRequires: tomcat55 +%endif %endif %define prefix /usr -License: LGPL +License: LGPL v2.1 or later +Group: System/Libraries Group: Applications/System Autoreqprov: on %define bldno @VERSION@ @@ -35,11 +40,15 @@ Summary: Novell CASA Authentication Token Service Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: jre >= 1.5.0 -Requires: servletapi5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA curl +Requires: servletapi5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA curl %if %suse_version < 1030 -Requires: tomcat5 +Requires: tomcat5 %else -Requires: tomcat55 +%if %suse_version > 1030 +Requires: tomcat6 +%else +Requires: tomcat55 +%endif %endif PreReq: %fillup_prereq %insserv_prereq PreReq: /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd diff --git a/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in b/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in index f88a67c7..d0d4b55c 100644 --- a/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in +++ b/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in @@ -27,7 +27,9 @@ Summary: Configuration of casa-ats @clientdir@/*.ycp @moduledir@/CasaAts.* @desktopdir@/casa-ats.desktop +%if %suse_version < 1030 @themedir@/NLD/icons/22x22/apps/*.png @themedir@/NLD/icons/32x32/apps/*.png @themedir@/NLD/icons/48x48/apps/*.png +%endif %doc @docdir@ diff --git a/yast2-CASA/yast2-CASA.spec.in b/yast2-CASA/yast2-CASA.spec.in index ac279ffc..fc8629e6 100644 --- a/yast2-CASA/yast2-CASA.spec.in +++ b/yast2-CASA/yast2-CASA.spec.in @@ -67,9 +67,11 @@ exit 0 %defattr(-,root,root) %dir @yncludedir@/CASA /usr/share/applications/install_casa_yast_icons +%if %suse_version < 1030 /usr/share/pixmaps/CASA_22.png /usr/share/pixmaps/CASA_32.png /usr/share/pixmaps/CASA_48.png +%endif @yncludedir@/CASA/* @clientdir@/CASA.ycp @clientdir@/CASA_*.ycp