Check-point of changes made to build under autobuild using the

identity-abstraction that is part of it.
This commit is contained in:
Juan Carlos Luciani 2006-07-26 17:06:46 +00:00
parent 8f19a3798b
commit e1d46bdd6d
3 changed files with 35 additions and 32 deletions

View File

@ -24,8 +24,7 @@ SUBDIRS = server package
DIST_SUBDIRS = include server package DIST_SUBDIRS = include server package
#EXTRA_DIST = autogen.sh EXTRA_DIST = autogen.sh
EXTRA_DIST = autogen.sh bandit bandit/commons bandit/commons/* bandit/ia/*
.PHONY: package package-clean package-install package-uninstall .PHONY: package package-clean package-install package-uninstall
package package-clean package-install package-uninstall: package package-clean package-install package-uninstall:

View File

@ -17,8 +17,9 @@
Name: @PACKAGE@ Name: @PACKAGE@
URL: http://www.novell.com/products URL: http://www.novell.com/products
BuildRequires: gcc-c++ glib2-devel krb5-devel libgssapi libstdc++-devel pam-devel pkgconfig java-1_5_0-ibm-devel apache2-devel update-alternatives mono-devel CASA-devel servletapi5 BuildRequires: libstdc++ libgcc gcc-c++ glib2-devel krb5-devel libgssapi libstdc++-devel pam-devel pkgconfig java-1_5_0-ibm-devel apache2-devel update-alternatives mono-devel CASA-devel servletapi5 identity-abstraction
%define prefix /usr %define prefix /usr
%define jprefix /usr/share/java
License: LGPL License: LGPL
Group: Applications/System Group: Applications/System
Autoreqprov: on Autoreqprov: on
@ -129,22 +130,24 @@ install -d %{buildroot}%{prefix}
install -d %{buildroot}%{prefix}/%{_lib} install -d %{buildroot}%{prefix}/%{_lib}
install -d %{buildroot}%{prefix}/%{_lib}/security install -d %{buildroot}%{prefix}/%{_lib}/security
install -d %{buildroot}%{prefix}/include install -d %{buildroot}%{prefix}/include
install -d %{buildroot}%{prefix}/share
install -d %{buildroot}%{prefix}/share/java
## CASA-auth-token-service ## ## CASA-auth-token-service ##
# Libs # Libs
install -m 755 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war.%{bldno} install -m 755 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war.%{bldno}
# Lib Symbolic Links # Lib Symbolic Links
ln -s CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war ln -sf CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war
ln -s CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war.1 ln -sf CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war.1
## CASA-auth-token-server-support ## ## CASA-auth-token-server-support ##
# Libs # Libs
install -m 755 %{_lib}/%{cfg}/libcasa_s_authtoken.so %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno} install -m 755 %{_lib}/%{cfg}/libcasa_s_authtoken.so %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno}
# Lib Symbolic Links # Lib Symbolic Links
ln -s 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
ln -s libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1 ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
## CASA-auth-token-pam-support ## ## CASA-auth-token-pam-support ##
# Libs # Libs
@ -152,27 +155,27 @@ install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/s
#install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so #install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so
# Lib Symbolic Links # Lib Symbolic Links
ln -s pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so ln -sf pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so
ln -s pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.1 ln -sf pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.1
## CASA-auth-token-apache2_2-support ## ## CASA-auth-token-apache2_2-support ##
# Libs # Libs
install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno} install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
# Lib Symbolic Linksln -s %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so # Lib Symbolic Links
ln -s 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
ln -s mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1 ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1
## CASA-auth-token-jaas-support ## ## CASA-auth-token-jaas-support ##
# Libs # Libs
install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar.%{bldno} install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar.%{bldno}
install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar.%{bldno} install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CasaAuthToken.jar.%{bldno}
# Lib Symbolic Links # Lib Symbolic Links
ln -s CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar ln -sf CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar
ln -s CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar.1 ln -sf CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar.1
ln -s CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar ln -sf CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthToken.jar
ln -s CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar.1 ln -sf CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthToken.jar.1
## CASA-auth-token-devel ## ## CASA-auth-token-devel ##
# Header Files # Header Files
@ -199,9 +202,9 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{prefix}/%{_lib}/CasaAuthTokenSvc.war.%{bldno} %{prefix}/share/java/CasaAuthTokenSvc.war.%{bldno}
%{prefix}/%{_lib}/CasaAuthTokenSvc.war %{prefix}/share/java/CasaAuthTokenSvc.war
%{prefix}/%{_lib}/CasaAuthTokenSvc.war.1 %{prefix}/share/java/CasaAuthTokenSvc.war.1
## CASA-auth-token-server-support ## ## CASA-auth-token-server-support ##
@ -239,6 +242,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n CASA-auth-token-pam-support %files -n CASA-auth-token-pam-support
%defattr(-,root,root) %defattr(-,root,root)
%dir %{prefix}/%{_lib}/security
%{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno} %{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno}
%{prefix}/%{_lib}/security/pam_casaauthtok.so %{prefix}/%{_lib}/security/pam_casaauthtok.so
%{prefix}/%{_lib}/security/pam_casaauthtok.so.1 %{prefix}/%{_lib}/security/pam_casaauthtok.so.1
@ -279,12 +283,12 @@ rm -rf $RPM_BUILD_ROOT
%files -n CASA-auth-token-jaas-support %files -n CASA-auth-token-jaas-support
%defattr(-,root,root) %defattr(-,root,root)
%{prefix}/%{_lib}/CasaJaasSupport.jar.%{bldno} %{prefix}/share/java/CasaJaasSupport.jar.%{bldno}
%{prefix}/%{_lib}/CasaJaasSupport.jar %{prefix}/share/java/CasaJaasSupport.jar
%{prefix}/%{_lib}/CasaJaasSupport.jar.1 %{prefix}/share/java/CasaJaasSupport.jar.1
%{prefix}/%{_lib}/CasaAuthToken.jar.%{bldno} %{prefix}/share/java/CasaAuthToken.jar.%{bldno}
%{prefix}/%{_lib}/CasaAuthToken.jar %{prefix}/share/java/CasaAuthToken.jar
%{prefix}/%{_lib}/CasaAuthToken.jar.1 %{prefix}/share/java/CasaAuthToken.jar.1
## CASA-auth-token-devel ## ## CASA-auth-token-devel ##

View File

@ -33,8 +33,8 @@ ROOT = ../..
LIBDIR = $(ROOT)/$(LIB) LIBDIR = $(ROOT)/$(LIB)
IDENT_ABSTRACTION_DIR = $(ROOT)/bandit/ia IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction
IDENT_ABSTRACTION_DEPENDANCIES_DIR = $(ROOT)/bandit/commons IDENT_ABSTRACTION_DEPENDANCIES_DIR = /usr/share/java/identity-abstraction/dependancies
JAVAROOT = . JAVAROOT = .
JAVAC= javac JAVAC= javac
@ -79,7 +79,7 @@ AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
LIBS = /usr/share/java/servletapi5.jar LIBS = /usr/share/java/servletapi5.jar
CLASSPATH = $(IDENT_ABSTRACTION_DIR):$(LIBS) CLASSPATH = $(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(LIBS)
CUR_DIR := $(shell pwd) CUR_DIR := $(shell pwd)