Hello community,
here is the log from the commit of package axis for openSUSE:Factory checked in
at 2017-05-31 13:28:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/axis (Old)
and /work/SRC/openSUSE:Factory/.axis.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "axis"
Wed May 31 13:28:33 2017 rev:26 rq:496517 version:1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/axis/axis.changes 2015-04-02
15:54:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.axis.new/axis.changes 2017-05-31
13:28:34.614215711 +0200
@@ -1,0 +2,12 @@
+Fri May 19 08:54:25 UTC 2017 - tchva...@suse.com
+
+- Fix build with new javapackages-tools
+
+-------------------------------------------------------------------
+Wed May 17 10:38:22 UTC 2017 - tchva...@suse.com
+
+- Disable javadoc
+- Fix build with new ant 1.9.8+
+ * axis-ant-build.patch
+
+-------------------------------------------------------------------
New:
----
axis-ant-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ axis.spec ++++++
--- /var/tmp/diff_new_pack.DLGcpE/_old 2017-05-31 13:28:35.978023480 +0200
+++ /var/tmp/diff_new_pack.DLGcpE/_new 2017-05-31 13:28:35.978023480 +0200
@@ -1,7 +1,7 @@
#
# spec file for package axis
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -44,6 +44,7 @@
Patch0: unimplemented-dom3-methods.patch
Patch1: axis-1.4-gcc44_build.patch
Patch2: axis-manifest.patch
+Patch3: axis-ant-build.patch
BuildRequires: ant
BuildRequires: ant-jdepend
BuildRequires: antlr
@@ -54,6 +55,7 @@
BuildRequires: gnu-jaf
BuildRequires: jakarta-commons-discovery
BuildRequires: java-devel
+BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j-mini
@@ -67,10 +69,10 @@
Requires: jakarta-commons-discovery
Requires: java
Requires: javamail
-Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: log4j
Requires: wsdl4j
+Obsoletes: %{name}-javadoc
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,14 +80,6 @@
Apache Axis is an implementation of the SOAP ("Simple Object Access
Protocol") submission to W3C.
-%package javadoc
-PreReq: coreutils
-Summary: Api documentation for axis
-Group: Documentation/Other
-
-%description javadoc
-Api documentation for axis
-
%package manual
Summary: Manual for axis
Group: Documentation/Other
@@ -95,11 +89,11 @@
%prep
%setup -q -n %{name}-1_4
-ln -s %{_javadocdir}/%{name} docs/apiDocs
%patch0 -p1
%patch1 -p1 -b gcc44-build
%patch2 -p0
+%patch3 -p1
# Remove provided binaries
find . -name "*.jar" -exec rm -f {} \;
@@ -113,7 +107,6 @@
CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3
commons-logging log4j activation javamail servletapi5)
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 LC_ALL="en_US.UTF-8" # necessary for javadoc
ant -Dcompile.ime=true \
-Dwsdl4j.jar=$(build-classpath wsdl4j) \
-Dcommons-discovery.jar=$(build-classpath commons-discovery) \
@@ -130,7 +123,7 @@
-Djsse.jar=$(build-classpath jsse/jsse 2>/dev/null) \
-Dant.build.javac.source=1.4 \
-Dant.build.javac.target=1.4 \
- clean compile javadocs
+ clean compile
%install
### Jar files
@@ -140,10 +133,6 @@
%{buildroot}%{_javadir}/%{name}
popd
-### Javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
-
# POMs
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -m 644 %{S:4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis.pom
@@ -165,11 +154,6 @@
%{_mavenpomdir}/*.pom
%{_datadir}/maven-metadata/%{name}.xml
-%files javadoc
-%defattr(0644,root,root,0755)
-%dir %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}/*
-
%files manual
%defattr(0644,root,root,0755)
%doc docs/*
++++++ axis-ant-build.patch ++++++
Index: axis-1_4/build.xml
===================================================================
--- axis-1_4.orig/build.xml
+++ axis-1_4/build.xml
@@ -92,6 +92,9 @@ Copyright:
<depend srcdir="${src.dir}" destdir="${build.dest}"
cache="${build.dir}/dependencycache" closure="no">
</depend>
+ <presetdef name="javac">
+ <javac includeantruntime="false" />
+ </presetdef>
<javac srcdir="${src.dir}" destdir="${build.dest}" nowarn="${nowarn}"
debug="${debug}"
deprecation="${deprecation}"
source="${source}"
Index: axis-1_4/tools/build.xml
===================================================================
--- axis-1_4.orig/tools/build.xml
+++ axis-1_4/tools/build.xml
@@ -106,7 +106,7 @@ Copyright:
<fileset dir="${tools.dir}"
includes="*-tasks.properties"/>
<fileset dir="${tools.dir}" includes="org/**/*.xml"/>
- <fileset dir="${tools.dir}" file="log4j.properties"/>
+ <fileset dir="${tools.dir}" includes="log4j.properties"/>
</copy>
<tstamp/>
