From a20338f81089f64e349b7cdb7bde9f1d2574ff6e0a1d7a2e20fb4937ff04053e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 28 May 2009 00:45:31 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/axis?expand=0&rev=7

---
 axis-1.4-gcc44_build.patch | 18 ++++++++++++++++++
 axis.changes               |  5 +++++
 axis.spec                  | 24 ++++++++++++++++++------
 3 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 axis-1.4-gcc44_build.patch

diff --git a/axis-1.4-gcc44_build.patch b/axis-1.4-gcc44_build.patch
new file mode 100644
index 0000000..b636f5d
--- /dev/null
+++ b/axis-1.4-gcc44_build.patch
@@ -0,0 +1,18 @@
+Index: axis-1_4/src/org/apache/axis/i18n/ProjectResourceBundle.java
+===================================================================
+--- axis-1_4.orig/src/org/apache/axis/i18n/ProjectResourceBundle.java	2006-04-23 03:57:27.000000000 +0200
++++ axis-1_4/src/org/apache/axis/i18n/ProjectResourceBundle.java	2009-05-21 14:44:28.299254186 +0200
+@@ -360,10 +360,11 @@
+     /**
+      * Clears the internal cache
+      */
+-    public static void clearCache()
++/*  Final method in gcc44, so lets delete
++ *  public static void clearCache()
+     {
+         bundleCache.clear();
+-    }
++    }*/
+     
+     public String toString() {
+         return resourceName;
diff --git a/axis.changes b/axis.changes
index c239703..fc555fe 100644
--- a/axis.changes
+++ b/axis.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 21 15:01:43 CEST 2009 - mvyskocil@suse.cz
+
+- fixed build with new gcj44 
+
 -------------------------------------------------------------------
 Thu Jul 31 13:22:10 CEST 2008 - mvyskocil@suse.cz
 
diff --git a/axis.spec b/axis.spec
index ad350e4..3a5e8fc 100644
--- a/axis.spec
+++ b/axis.spec
@@ -1,10 +1,17 @@
 #
 # spec file for package axis (Version 1.4)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -21,14 +28,14 @@ BuildRequires:  java-1_5_0-gcj-compat-devel
 %define release    2jpp
 %define section    free
 Version:        1.4
-Release:        236
+Release:        265
 Summary:        Apache implementation of the SOAP
 License:        The Apache Software License
 Group:          Development/Languages/Java
 Url:            http://ws.apache.org/axis/
 Source0:        %{name}-src-%{archivever}.tar.bz2
 Patch0:         unimplemented-dom3-methods.patch
-#Patch0:       %{name}-%{version}-no_ant_depend_tag.patch
+Patch1:         axis-1.4-gcc44_build.patch
 # Mandatory requires
 # optional requires
 Requires:       java
@@ -176,6 +183,9 @@ Authors:
 %prep
 %setup -q -n %{name}-%{archivever}
 %patch0 -p1
+%if %suse_version >= 1120
+%patch1 -p1 -b gcc44-build
+%endif
 # Remove provided binaries
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.zip" -exec rm -f {} \;
@@ -187,7 +197,7 @@ export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
 CLASSPATH=$(build-classpath wsdl4j jakarta-commons-discovery jakarta-commons-httpclient3 jakarta-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"
-echo CLASSPATH=$CLASSPATH
+export LC_ALL="en_US.UTF-8" # necessary for javadoc
 ant -Dcompile.ime=true \
     -Dwsdl4j.jar=$(build-classpath wsdl4j) \
     -Dcommons-discovery.jar=$(build-classpath jakarta-commons-discovery) \
@@ -256,6 +266,8 @@ fi
 %doc docs/*
 
 %changelog
+* Thu May 21 2009 mvyskocil@suse.cz
+- fixed build with new gcj44
 * Thu Jul 31 2008 mvyskocil@suse.cz
 - replace gnu-javamail dependency to classpathx-mail [bnc#411839]
   - the classpathx-foo is consistent with jpackage.org project