Fixed build issues introduced as I was finishing the changes for the
removal of the Axis dependency. Updated the CASA_auth_token_jaas_support RPMs to install the external files in a folder which reflects their supplier. This was done to more clearly associate the licenses with the files.
This commit is contained in:
parent
39cb26f298
commit
bbb8b25e49
@ -26,7 +26,7 @@ DIST_SUBDIRS = lib
|
||||
|
||||
CFILES =
|
||||
|
||||
EXTRA_DIST = LICENSE NOTICE
|
||||
EXTRA_DIST =
|
||||
|
||||
.PHONY: package package-clean package-install package-uninstall
|
||||
package package-clean package-install package-uninstall:
|
||||
|
@ -285,6 +285,7 @@ Svc/external/xmlsec/xml-security-1_4_0/libs/Makefile
|
||||
Svc/external/log4j/Makefile
|
||||
Svc/external/log4j/logging-log4j-1.2.14/Makefile
|
||||
Svc/external/log4j/logging-log4j-1.2.14/dist/Makefile
|
||||
Svc/external/log4j/logging-log4j-1.2.14/dist/lib/Makefile
|
||||
Svc/src/Makefile
|
||||
Svc/src/com/Makefile
|
||||
Svc/src/com/novell/Makefile
|
||||
|
@ -118,6 +118,7 @@ install -d -m 700 %{buildroot}/srv/www/casaats/logs
|
||||
install -d -m 700 %{buildroot}/srv/www/casaats/work
|
||||
install -d -m 700 %{buildroot}/srv/www/casaats/temp
|
||||
install -d %{buildroot}%{prefix}/share/java/CASA/authtoken/external
|
||||
install -d %{buildroot}%{prefix}/share/java/CASA/authtoken/external/apache.org
|
||||
install -d %{buildroot}/etc
|
||||
install -d %{buildroot}/etc/init.d
|
||||
install -d -m 755 %{buildroot}/var/lib/CASA
|
||||
@ -187,8 +188,8 @@ install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xm
|
||||
# Libs
|
||||
install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaJaasSupport-%{bldno}.jar
|
||||
install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
|
||||
install -m 755 Svc/external/xmlsec/xml-security-1_4_0/libs/xmlsec-1.4.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
|
||||
install -m 644 Svc/external/xmlsec/xml-security-1_4_0/LICENSE %{buildroot}%{prefix}/share/java/CASA/authtoken/external/LICENSE
|
||||
install -m 755 Svc/external/xmlsec/xml-security-1_4_0/libs/xmlsec-1.4.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/apache.org/xmlsec-1.4.0.jar
|
||||
install -m 644 Svc/external/xmlsec/xml-security-1_4_0/LICENSE %{buildroot}%{prefix}/share/java/CASA/authtoken/external/apache.org/LICENSE
|
||||
install -m 644 Jaas/linux/casa_crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/casa_crypto.properties
|
||||
|
||||
# Symbolic Links
|
||||
@ -330,6 +331,7 @@ rm -f /srv/www/casaats/conf/server.xml
|
||||
%dir %{prefix}/share/java/CASA/authtoken
|
||||
%dir %{prefix}/share/java/CASA/authtoken/bin
|
||||
%dir %{prefix}/share/java/CASA/authtoken/external
|
||||
%dir %{prefix}/share/java/CASA/authtoken/external/apache.org
|
||||
%dir /etc/CASA
|
||||
%dir /etc/CASA/authtoken
|
||||
%dir /etc/CASA/authtoken/keys
|
||||
@ -339,8 +341,8 @@ rm -f /srv/www/casaats/conf/server.xml
|
||||
%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
|
||||
%{prefix}/share/java/CASA/authtoken/CasaAuthToken.jar
|
||||
%{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh
|
||||
%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/LICENSE
|
||||
%{prefix}/share/java/CASA/authtoken/external/apache.org/xmlsec-1.4.0.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/apache.org/LICENSE
|
||||
%config /etc/CASA/authtoken/keys/client/casa_crypto.properties
|
||||
|
||||
|
||||
|
@ -118,6 +118,7 @@ install -d -m 700 %{buildroot}/srv/www/casaats/logs
|
||||
install -d -m 700 %{buildroot}/srv/www/casaats/work
|
||||
install -d -m 700 %{buildroot}/srv/www/casaats/temp
|
||||
install -d %{buildroot}%{prefix}/share/java/CASA/authtoken/external
|
||||
install -d %{buildroot}%{prefix}/share/java/CASA/authtoken/external/apache.org
|
||||
install -d %{buildroot}/etc
|
||||
install -d %{buildroot}/etc/init.d
|
||||
install -d -m 755 %{buildroot}/var/lib/CASA
|
||||
@ -187,8 +188,8 @@ install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xm
|
||||
# Libs
|
||||
install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaJaasSupport-%{bldno}.jar
|
||||
install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
|
||||
install -m 755 Svc/external/xmlsec/xml-security-1_4_0/libs/xmlsec-1.4.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
|
||||
install -m 644 Svc/external/xmlsec/xml-security-1_4_0/LICENSE %{buildroot}%{prefix}/share/java/CASA/authtoken/external/LICENSE
|
||||
install -m 755 Svc/external/xmlsec/xml-security-1_4_0/libs/xmlsec-1.4.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/apache.org/xmlsec-1.4.0.jar
|
||||
install -m 644 Svc/external/xmlsec/xml-security-1_4_0/LICENSE %{buildroot}%{prefix}/share/java/CASA/authtoken/external/apache.org/LICENSE
|
||||
install -m 644 Jaas/linux/casa_crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/casa_crypto.properties
|
||||
|
||||
# Symbolic Links
|
||||
@ -330,6 +331,7 @@ rm -f /srv/www/casaats/conf/server.xml
|
||||
%dir %{prefix}/share/java/CASA/authtoken
|
||||
%dir %{prefix}/share/java/CASA/authtoken/bin
|
||||
%dir %{prefix}/share/java/CASA/authtoken/external
|
||||
%dir %{prefix}/share/java/CASA/authtoken/external/apache.org
|
||||
%dir /etc/CASA
|
||||
%dir /etc/CASA/authtoken
|
||||
%dir /etc/CASA/authtoken/keys
|
||||
@ -339,8 +341,8 @@ rm -f /srv/www/casaats/conf/server.xml
|
||||
%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
|
||||
%{prefix}/share/java/CASA/authtoken/CasaAuthToken.jar
|
||||
%{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh
|
||||
%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/LICENSE
|
||||
%{prefix}/share/java/CASA/authtoken/external/apache.org/xmlsec-1.4.0.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/apache.org/LICENSE
|
||||
%config /etc/CASA/authtoken/keys/client/casa_crypto.properties
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user