This commit is contained in:
parent
8017a7dda2
commit
387b27a172
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 21 13:15:13 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Depend on the glassfish-activation-api standalone in order to
|
||||||
|
prevent missing APIs when running the ant task
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Mar 18 13:55:46 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Fri Mar 18 13:55:46 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
18
axis.spec
18
axis.spec
@ -57,6 +57,7 @@ BuildRequires: ant-jdepend
|
|||||||
BuildRequires: antlr
|
BuildRequires: antlr
|
||||||
BuildRequires: apache-commons-httpclient
|
BuildRequires: apache-commons-httpclient
|
||||||
BuildRequires: apache-commons-logging
|
BuildRequires: apache-commons-logging
|
||||||
|
BuildRequires: glassfish-activation-api
|
||||||
BuildRequires: jakarta-commons-discovery
|
BuildRequires: jakarta-commons-discovery
|
||||||
BuildRequires: java-devel >= 1.8
|
BuildRequires: java-devel >= 1.8
|
||||||
BuildRequires: javamail
|
BuildRequires: javamail
|
||||||
@ -70,6 +71,7 @@ BuildRequires: wsdl4j
|
|||||||
BuildRequires: xerces-j2
|
BuildRequires: xerces-j2
|
||||||
Requires: apache-commons-httpclient
|
Requires: apache-commons-httpclient
|
||||||
Requires: apache-commons-logging
|
Requires: apache-commons-logging
|
||||||
|
Requires: glassfish-activation-api
|
||||||
Requires: jakarta-commons-discovery
|
Requires: jakarta-commons-discovery
|
||||||
Requires: java
|
Requires: java
|
||||||
Requires: javamail
|
Requires: javamail
|
||||||
@ -78,10 +80,6 @@ Requires: reload4j
|
|||||||
Requires: wsdl4j
|
Requires: wsdl4j
|
||||||
Obsoletes: %{name}-javadoc
|
Obsoletes: %{name}-javadoc
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if 0%{?suse_version} > 1500
|
|
||||||
BuildRequires: glassfish-activation-api
|
|
||||||
Requires: glassfish-activation-api
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Apache Axis is an implementation of the SOAP ("Simple Object Access
|
Apache Axis is an implementation of the SOAP ("Simple Object Access
|
||||||
@ -125,11 +123,9 @@ mkdir -p build/schema
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
|
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
|
||||||
CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging reload4j \
|
CLASSPATH=$(build-classpath wsdl4j commons-discovery \
|
||||||
%if 0%{?suse_version} > 1500
|
commons-httpclient3 commons-logging reload4j \
|
||||||
glassfish-activation-api \
|
glassfish-activation-api javamail servletapi5)
|
||||||
%endif
|
|
||||||
javamail servletapi5)
|
|
||||||
export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jdepend jimi xml-security jsse httpunit jms castor 2>/dev/null)
|
export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jdepend jimi xml-security jsse httpunit jms castor 2>/dev/null)
|
||||||
export OPT_JAR_LIST="ant/ant-nodeps"
|
export OPT_JAR_LIST="ant/ant-nodeps"
|
||||||
ant -Dcompile.ime=true \
|
ant -Dcompile.ime=true \
|
||||||
@ -138,11 +134,7 @@ ant -Dcompile.ime=true \
|
|||||||
-Dcommons-logging.jar=$(build-classpath commons-logging) \
|
-Dcommons-logging.jar=$(build-classpath commons-logging) \
|
||||||
-Dcommons-httpclient.jar=$(build-classpath commons-httpclient3) \
|
-Dcommons-httpclient.jar=$(build-classpath commons-httpclient3) \
|
||||||
-Dlog4j-core.jar=$(build-classpath reload4j/reload4j) \
|
-Dlog4j-core.jar=$(build-classpath reload4j/reload4j) \
|
||||||
%if 0%{?suse_version} > 1500
|
|
||||||
-Dactivation.jar=$(build-classpath glassfish-activation-api) \
|
-Dactivation.jar=$(build-classpath glassfish-activation-api) \
|
||||||
%else
|
|
||||||
-Dactivation.jar= \
|
|
||||||
%endif
|
|
||||||
-Dmailapi.jar=$(build-classpath javamail/mailapi) \
|
-Dmailapi.jar=$(build-classpath javamail/mailapi) \
|
||||||
-Dxerces.jar=$(build-classpath jaxp_parser_impl) \
|
-Dxerces.jar=$(build-classpath jaxp_parser_impl) \
|
||||||
-Dservlet.jar=$(build-classpath servletapi5) \
|
-Dservlet.jar=$(build-classpath servletapi5) \
|
||||||
|
Loading…
Reference in New Issue
Block a user