From b1557730ede5648e1af5dbb9aa94b9f239d7ff522ed4042a51a271047c0f2e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 May 2017 10:37:31 +0000 Subject: [PATCH 1/3] - Disable javadoc - Fix build with new ant 1.9.8+ OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=19 --- axis-ant-build.patch | 27 +++++++++++++++++++++++++++ axis.changes | 6 ++++++ axis.spec | 26 +++++--------------------- 3 files changed, 38 insertions(+), 21 deletions(-) create mode 100644 axis-ant-build.patch diff --git a/axis-ant-build.patch b/axis-ant-build.patch new file mode 100644 index 0000000..f5c866c --- /dev/null +++ b/axis-ant-build.patch @@ -0,0 +1,27 @@ +Index: axis-1_4/build.xml +=================================================================== +--- axis-1_4.orig/build.xml ++++ axis-1_4/build.xml +@@ -92,6 +92,9 @@ Copyright: + + ++ ++ ++ + + +- ++ + + + diff --git a/axis.changes b/axis.changes index 83429b2..f039b6a 100644 --- a/axis.changes +++ b/axis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 17 10:38:22 UTC 2017 - tchvatal@suse.com + +- Disable javadoc +- Fix build with new ant 1.9.8+ + ------------------------------------------------------------------- Wed Mar 18 09:46:02 UTC 2015 - tchvatal@suse.com diff --git a/axis.spec b/axis.spec index 732dab5..ac12d36 100644 --- a/axis.spec +++ b/axis.spec @@ -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 @@ Source8: axis-schema-1.4.pom 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 @@ -71,6 +72,7 @@ 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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 @@ Manual for axis %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 @@ cp %{SOURCE1} %{SOURCE2} %{SOURCE3} . 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 @@ ant -Dcompile.ime=true \ -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 @@ pushd build/lib %{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 @@ install -m 644 %{S:7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-saaj.pom %{_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/* From 860972b1032d1a09e798535c226df9342258ddfe95b8d86eff6fbd4216821a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 May 2017 10:51:24 +0000 Subject: [PATCH 2/3] * axis-ant-build.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=20 --- axis.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/axis.changes b/axis.changes index f039b6a..4dec300 100644 --- a/axis.changes +++ b/axis.changes @@ -3,6 +3,7 @@ Wed May 17 10:38:22 UTC 2017 - tchvatal@suse.com - Disable javadoc - Fix build with new ant 1.9.8+ + * axis-ant-build.patch ------------------------------------------------------------------- Wed Mar 18 09:46:02 UTC 2015 - tchvatal@suse.com From f19b3b67062327d8d348ea6447c414033e0513b77470297a67b4e70b5a0a7e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 08:53:22 +0000 Subject: [PATCH 3/3] - Fix build with new javapackages-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=21 --- axis.changes | 5 +++++ axis.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/axis.changes b/axis.changes index 4dec300..050cb02 100644 --- a/axis.changes +++ b/axis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 19 08:54:25 UTC 2017 - tchvatal@suse.com + +- Fix build with new javapackages-tools + ------------------------------------------------------------------- Wed May 17 10:38:22 UTC 2017 - tchvatal@suse.com diff --git a/axis.spec b/axis.spec index ac12d36..b1abf6c 100644 --- a/axis.spec +++ b/axis.spec @@ -55,6 +55,7 @@ BuildRequires: classpathx-mail BuildRequires: gnu-jaf BuildRequires: jakarta-commons-discovery BuildRequires: java-devel +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: log4j-mini @@ -68,7 +69,6 @@ Requires: jaf Requires: jakarta-commons-discovery Requires: java Requires: javamail -Requires: javapackages-tools Requires: jaxp_parser_impl Requires: log4j Requires: wsdl4j