OBS User unknown 2008-09-12 21:22:52 +00:00 committed by Git OBS Bridge
parent 81194e1e63
commit 482233912b
4 changed files with 101 additions and 6 deletions

42
bea-stax-gcj-build.patch Normal file
View File

@ -0,0 +1,42 @@
--- 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 @@
Iterator ni = XMLEventAllocatorBase.getNamespaces(reader);
while (ni.hasNext())
- startElement.addAttribute((Namespace)ni.next());
+ startElement.addAttribute((Attribute)ni.next());
return startElement;
}
--- src/com/bea/xml/stream/samples/Parse.java
+++ src/com/bea/xml/stream/samples/Parse.java
@@ -122,11 +122,12 @@
}
private static void printNamespace(Namespace a) {
- System.out.println("PREFIX: " + a.getName().getPrefix());
- System.out.println("NAMESP: " + a.getName().getNamespaceURI());
- System.out.println("NAME: " + a.getName().getLocalPart());
- System.out.println("VALUE: " + a.getValue());
- System.out.println("TYPE: " + a.getDTDType());
+ Attribute at = (Attribute) a;
+ System.out.println("PREFIX: " + at.getName().getPrefix());
+ System.out.println("NAMESP: " + at.getName().getNamespaceURI());
+ System.out.println("NAME: " + at.getName().getLocalPart());
+ System.out.println("VALUE: " + at.getValue());
+ System.out.println("TYPE: " + at.getDTDType());
}
}

29
bea-stax-target15.patch Normal file
View File

@ -0,0 +1,29 @@
--- build.xml
+++ build.xml
@@ -70,7 +70,7 @@
<!--mkdir dir="${api_src_dir}"/-->
<!--unjar src="${jar_api}" dest="${class_dir}"/-->
<javac srcdir="${src_api}"
- source="1.2" target="1.2"
+ source="1.5" target="1.5"
includes="${api_dirs}"
destdir="${class_dir}"
debug="true">
@@ -104,7 +104,7 @@
<target name="compile" depends="init,api">
<!--javac srcdir="${src}:${api_src_dir}"-->
<javac srcdir="${src}"
- source="1.2" target="1.2"
+ source="1.5" target="1.5"
includes="${topdirs}"
destdir="${class_dir}"
debug="true">
@@ -124,7 +124,7 @@
</target>
<target name="test_compile" depends="api, test_init">
<javac srcdir="${src}" includes="org/codehaus/stax/test/**/*.java"
- source="1.2" target="1.2"
+ source="1.5" target="1.5"
destdir="${test_class_dir}"
debug="true">
<classpath>

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 12 09:57:50 CEST 2008 - mvyskocil@suse.cz
- target=1.5 -source=1.5
- build with gcj
- remove a dot in summary to prevent of an rpmlint error
-------------------------------------------------------------------
Wed Mar 12 09:32:31 CET 2008 - anosek@suse.cz

View File

@ -1,10 +1,17 @@
#
# spec file for package bea-stax (Version 0)
# spec file for package bea-stax (Version MACRO)
#
# 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.
#
# 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/
#
@ -16,16 +23,18 @@
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
Name: bea-stax
Version: %{version}
Release: 1
Release: 4
License: The Apache Software License
Group: Development/Libraries/Java
BuildArch: noarch
BuildRequires: jpackage-utils >= 1.6
%if %defined suse_version
BuildRequires: java-devel
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: unzip
BuildRequires: ant
%endif
@ -40,7 +49,8 @@ parsing and writing XML easily and efficiently.
%package api
Summary: The StAX API.
License: The Apache Software License
Summary: The StAX API
Group: Development/Libraries/Java
%description api
@ -51,6 +61,7 @@ Streaming API for XML
%{summary}
%package javadoc
License: The Apache Software License
Summary: Javadoc for bea-stax
Group: Development/Libraries/Java
@ -74,6 +85,8 @@ Streaming API for XML
%prep
echo =====%{name}=======
%setup -q -c -n %{name}-%{version}
%patch0 -b .target15
%patch1 -b .gcj-build
%build
ant all javadoc
@ -136,6 +149,10 @@ fi
#%{_datadir}/%{name}-%{version}
%changelog
* Fri Sep 12 2008 mvyskocil@suse.cz
- target=1.5 -source=1.5
- build with gcj
- remove a dot in summary to prevent of an rpmlint error
* Wed Mar 12 2008 anosek@suse.cz
- fixed Bea-stax contains a Sun proprietary copyright header (bnc#369318)
- removed problematic file: src/javax/xml/namespace/QName.java