From dc04120c03e1bbefcfd9007ab5dfe58cce2f07e97a75020fafcddde4bf00b3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 27 Jun 2014 13:38:17 +0000 Subject: [PATCH 1/2] - Depend on proper apache pkgs OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=14 --- axis.changes | 5 +++++ axis.spec | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/axis.changes b/axis.changes index 76d0db2..507bf13 100644 --- a/axis.changes +++ b/axis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 27 13:37:59 UTC 2014 - tchvatal@suse.com + +- Depend on proper apache pkgs + ------------------------------------------------------------------- Mon Sep 9 11:05:31 UTC 2013 - tchvatal@suse.com diff --git a/axis.spec b/axis.spec index a1e662e..4149e06 100644 --- a/axis.spec +++ b/axis.spec @@ -1,7 +1,7 @@ # # spec file for package axis # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -47,12 +47,12 @@ Patch2: axis-manifest.patch BuildRequires: ant BuildRequires: ant-jdepend BuildRequires: antlr +BuildRequires: apache-commons-httpclient +BuildRequires: apache-commons-logging BuildRequires: classpath BuildRequires: classpathx-mail BuildRequires: gnu-jaf BuildRequires: jakarta-commons-discovery -BuildRequires: jakarta-commons-httpclient3 -BuildRequires: jakarta-commons-logging BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: junit @@ -61,10 +61,10 @@ BuildRequires: servletapi5 BuildRequires: unzip BuildRequires: wsdl4j BuildRequires: xerces-j2 +Requires: apache-commons-httpclient +Requires: apache-commons-logging Requires: jaf Requires: jakarta-commons-discovery -Requires: jakarta-commons-httpclient3 -Requires: jakarta-commons-logging Requires: java Requires: javamail Requires: javapackages-tools @@ -128,8 +128,8 @@ ant -Dcompile.ime=true \ -Djunit.jar=$(build-classpath junit 2>/dev/null) \ -Djimi.jar=$(build-classpath jimi 2>/dev/null) \ -Djsse.jar=$(build-classpath jsse/jsse 2>/dev/null) \ - -Dant.build.javac.source=1.4 \ - -Dant.build.javac.target=1.4 \ + -Dant.build.javac.source=1.5 \ + -Dant.build.javac.target=1.5 \ clean compile javadocs %install From e9d351ffc9e4dd786eb89bab439eb720df71672d034351ef8ab3c0be8c484130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 27 Jun 2014 13:44:37 +0000 Subject: [PATCH 2/2] - Fix back javadoc OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=15 --- axis.changes | 5 +++++ axis.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/axis.changes b/axis.changes index 507bf13..4a1fa54 100644 --- a/axis.changes +++ b/axis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 27 13:44:24 UTC 2014 - tchvatal@suse.com + +- Fix back javadoc + ------------------------------------------------------------------- Fri Jun 27 13:37:59 UTC 2014 - tchvatal@suse.com diff --git a/axis.spec b/axis.spec index 4149e06..e2efabe 100644 --- a/axis.spec +++ b/axis.spec @@ -128,8 +128,8 @@ ant -Dcompile.ime=true \ -Djunit.jar=$(build-classpath junit 2>/dev/null) \ -Djimi.jar=$(build-classpath jimi 2>/dev/null) \ -Djsse.jar=$(build-classpath jsse/jsse 2>/dev/null) \ - -Dant.build.javac.source=1.5 \ - -Dant.build.javac.target=1.5 \ + -Dant.build.javac.source=1.4 \ + -Dant.build.javac.target=1.4 \ clean compile javadocs %install