From 6b83871de582c7063b6a05b6da84eba16c804cf4 Mon Sep 17 00:00:00 2001
From: Juan Carlos Luciani <jluciani@novell.com>
Date: Wed, 24 Jan 2007 06:27:52 +0000
Subject: [PATCH] Made spec file changes to support applications that want to
 dynamically link our libraries.

---
 CASA-auth-token/server/configure.in           | 15 +++++--
 .../linux/CASA_auth_token_server.changes      |  6 +++
 .../linux/CASA_auth_token_server.spec.in      | 44 +++++++++----------
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/CASA-auth-token/server/configure.in b/CASA-auth-token/server/configure.in
index 057a82e0..885e41d5 100644
--- a/CASA-auth-token/server/configure.in
+++ b/CASA-auth-token/server/configure.in
@@ -202,14 +202,21 @@ esac
 #
 # Check for IBM JVM
 #
-test_ibm_jvm=$(/usr/$LIB/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm)
-if test "$test_ibm_jvm" = ""
+if test -d /usr/$LIB/jvm/jre-1.5.0
 then
+test_ibm_jvm=$(/usr/$LIB/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm)
+  if test "$test_ibm_jvm" = ""
+  then
+    # Assume Sun JVM
+    JVM_VER=SUN
+  else
+    JVM_VER=IBM
+  fi
+else
   # Assume Sun JVM
   JVM_VER=SUN
-else
-  JVM_VER=IBM
 fi
+
 AC_SUBST(JVM_VER)
 AM_CONDITIONAL(IBM_JVM, test "$JVM_VER" = IBM)
 
diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes b/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
index 4d98d428..3d0b4b0d 100644
--- a/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
+++ b/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 24 10:43:02 MST 2007 - jluciani@novell.com
+
+- Made a spec file change to support applications that want to
+  dynamically load our libraries. 
+
 -------------------------------------------------------------------
 Wed Jan  3 14:58:51 MST 2007 - jluciani@novell.com
 
diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in b/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in
index 0fce1f21..f967888b 100644
--- a/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in
+++ b/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in
@@ -30,7 +30,7 @@ Release:        1
 Summary:        Novell CASA Authentication Token Libraries for C/C++ Server Applications
 Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       java >= 1.5.0
+Requires:       jre >= 1.5.0
 Requires:       expat binutils CASA_auth_token_jaas_support sysvinit insserv
 PreReq:         %fillup_prereq %insserv_prereq
 PreReq:		/usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd
@@ -193,6 +193,12 @@ install -m 755 %{_lib}/%{cfg}/libcasa_s_ipc.so %{buildroot}%{prefix}/%{_lib}/lib
 # Symbolic Links
 ln -sf casa_iden_token.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so
 ln -sf casa_iden_token.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so.1
+ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so
+ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
+ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so
+ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so.1
+ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so
+ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so.1
 
 # Bins
 install -m 755 %{binsource}/%{cfg}/CasaAuthtokenValidateD %{buildroot}%{prefix}/bin/casa_atvd
@@ -213,6 +219,10 @@ install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}/%{_lib}/security/p
 # Libs
 install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
 
+# Symbolic Links
+ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so
+ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1
+
 
 ## CASA_auth_token_server-devel ##
 # Header Files
@@ -220,18 +230,6 @@ install -m 644 include/casa_s_authtoken.h %{buildroot}%{prefix}/include
 install -m 644 include/casa_c_ipc.h %{buildroot}%{prefix}/include
 install -m 644 include/casa_s_ipc.h %{buildroot}%{prefix}/include
 
-# Symbolic Links for CASA_auth_token_server files
-ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so
-ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
-ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so
-ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so.1
-ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so
-ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so.1
-
-# Symbolic Links for CASA_auth_token_apache2_2_support files
-ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so
-ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -290,11 +288,17 @@ rm -rf /var/lib/CASA/authtoken/validate
 %dir /etc/CASA/authtoken/validate
 %dir /etc/CASA/authtoken/modules
 %{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno}
+%{prefix}/%{_lib}/libcasa_s_authtoken.so
+%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
+%{prefix}/%{_lib}/libcasa_c_ipc.so.%{bldno}
+%{prefix}/%{_lib}/libcasa_c_ipc.so
+%{prefix}/%{_lib}/libcasa_c_ipc.so.1
+%{prefix}/%{_lib}/libcasa_s_ipc.so.%{bldno}
+%{prefix}/%{_lib}/libcasa_s_ipc.so
+%{prefix}/%{_lib}/libcasa_s_ipc.so.1
 %{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so.%{bldno}
 %{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so
 %{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so.1
-%{prefix}/%{_lib}/libcasa_c_ipc.so.%{bldno}
-%{prefix}/%{_lib}/libcasa_s_ipc.so.%{bldno}
 %{prefix}/bin/casa_atvd
 %config /etc/CASA/authtoken/validate/envvars
 %config /etc/CASA/authtoken/modules/CasaIdentityToken.conf
@@ -337,6 +341,8 @@ rm -rf /var/lib/CASA/authtoken/validate
 %files -n CASA_auth_token_apache2_2_support
 %defattr(-,root,root)
 %{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
+%{prefix}/%{_lib}/mod_authn_casa.so
+%{prefix}/%{_lib}/mod_authn_casa.so.1
 
 
 ## CASA_auth_token_server-devel ##
@@ -357,14 +363,6 @@ rm -rf /var/lib/CASA/authtoken/validate
 %{prefix}/include/casa_s_authtoken.h
 %{prefix}/include/casa_c_ipc.h
 %{prefix}/include/casa_s_ipc.h
-%{prefix}/%{_lib}/libcasa_s_authtoken.so
-%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
-%{prefix}/%{_lib}/libcasa_c_ipc.so
-%{prefix}/%{_lib}/libcasa_c_ipc.so.1
-%{prefix}/%{_lib}/libcasa_s_ipc.so
-%{prefix}/%{_lib}/libcasa_s_ipc.so.1
-%{prefix}/%{_lib}/mod_authn_casa.so
-%{prefix}/%{_lib}/mod_authn_casa.so.1
 
 
 %changelog -n CASA_auth_token_server