OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bea-stax?expand=0&rev=4

bea-stax-gcj-build.patch

@@ -1,14 +1,3 @@
---- src/com/bea/xml/stream/AttributeBase.java
-+++ src/com/bea/xml/stream/AttributeBase.java
-@@ -86,7 +86,7 @@
-   public boolean isNamespaceDeclaration() { return false; }
-   public String getLocalName() { return name.getLocalPart(); }
-   public String getValue() { return value; }
--  public String getDTDType() { return "CDATA"; }
-+  public javax.xml.namespace.QName getDTDType() { return new javax.xml.namespace.QName("CDATA"); }
-   public String getNamespaceURI() { return name.getNamespaceURI();}
-   public void setNamespaceURI(String uri) { name = new QName(uri,name.getLocalPart()); }
- 
 --- src/com/bea/xml/stream/StaticAllocator.java
 +++ src/com/bea/xml/stream/StaticAllocator.java
 @@ -90,7 +90,7 @@

bea-stax-gcj43-build.patch

@@ -0,0 +1,11 @@
+--- src/com/bea/xml/stream/AttributeBase.java
++++ src/com/bea/xml/stream/AttributeBase.java
+@@ -86,7 +86,7 @@
+   public boolean isNamespaceDeclaration() { return false; }
+   public String getLocalName() { return name.getLocalPart(); }
+   public String getValue() { return value; }
+-  public String getDTDType() { return "CDATA"; }
++  public javax.xml.namespace.QName getDTDType() { return new javax.xml.namespace.QName("CDATA"); }
+   public String getNamespaceURI() { return name.getNamespaceURI();}
+   public void setNamespaceURI(String uri) { name = new QName(uri,name.getLocalPart()); }
+ 

bea-stax.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 21 15:58:21 CEST 2009 - mvyskocil@suse.cz
+
+- fixed build under gcj44:
+  * splitted uncompatible part of old gcj patch to gcj43 one
+
 -------------------------------------------------------------------
 Wed Oct  1 13:42:11 CEST 2008 - mvyskocil@suse.cz
 

bea-stax.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bea-stax (Version MACRO)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -24,11 +24,12 @@ Summary:        Streaming API for XML
 Url:            http://dev2dev.bea.com/technologies/stax/index.jsp
 Source0:        stax-src-1.2.0_rc1-dev.zip
 Patch0:         bea-stax-target15.patch
-Patch1:         bea-stax-gcj-build.patch
+Patch1:         bea-stax-gcj43-build.patch
+Patch2:         bea-stax-gcj-build.patch
 
 Name:           bea-stax
 Version:        %{version}
-Release:        5
+Release:        6
 License:        The Apache Software License
 Group:          Development/Libraries/Java
 BuildArch:      noarch
@@ -88,10 +89,12 @@ Streaming API for XML
 #%{summary}
 
 %prep
-echo =====%{name}=======
 %setup -q -c -n %{name}-%{version}
 %patch0 -b .target15
-%patch1 -b .gcj-build
+%if %suse_version <= 1110
+%patch1 -b .gcj43-build
+%endif
+%patch2 -b .gcj-build
 
 %build
 ant all javadoc
@@ -153,6 +156,9 @@ fi
 #%{_datadir}/%{name}-%{version}
 
 %changelog
+* Thu May 21 2009 mvyskocil@suse.cz
+- fixed build under gcj44:
+  * splitted uncompatible part of old gcj patch to gcj43 one
 * Wed Oct 01 2008 mvyskocil@suse.cz
 - rm of BuildRoot on install was removed
 - avoid of another openjdk build cycle: