pool/axis
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 734255 from Java:packages

Browse Source 
Build against the new compat package log4j12-mini

OBS-URL: https://build.opensuse.org/request/show/734255
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/axis?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2019-10-03 14:15:28 +00:00 committed by Git OBS Bridge
commit 077db3c8ce
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
axis.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 1 08:55:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against the new compat package log4j12-mini
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 9 13:45:36 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com> Thu May 9 13:45:36 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>

8
axis.spec
View File

@ -64,7 +64,7 @@ BuildRequires: javamail
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
BuildRequires: log4j-mini BuildRequires: log4j12-mini
BuildRequires: servletapi5 BuildRequires: servletapi5
BuildRequires: unzip BuildRequires: unzip
BuildRequires: wsdl4j BuildRequires: wsdl4j
@ -76,7 +76,7 @@ Requires: jakarta-commons-discovery
Requires: java Requires: java
Requires: javamail Requires: javamail
Requires: jaxp_parser_impl Requires: jaxp_parser_impl
Requires: log4j Requires: log4j12
Requires: wsdl4j Requires: wsdl4j
Obsoletes: %{name}-javadoc Obsoletes: %{name}-javadoc
BuildArch: noarch BuildArch: noarch
@ -118,7 +118,7 @@ cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
%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 log4j activation javamail servletapi5) CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging log4j12/log4j-12 activation 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 \
@ -126,7 +126,7 @@ ant -Dcompile.ime=true \
-Dcommons-discovery.jar=$(build-classpath commons-discovery) \ -Dcommons-discovery.jar=$(build-classpath commons-discovery) \
-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 log4j) \ -Dlog4j-core.jar=$(build-classpath log4j12/log4j-12) \
-Dactivation.jar=$(build-classpath jaf) \ -Dactivation.jar=$(build-classpath jaf) \
-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) \