From ceb927715b23fe04b64d9b492b1641c2f5cf0f026e49a855ed9c40d3ab739421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 5 Jan 2017 15:32:39 +0000 Subject: [PATCH] - Use java-devel and not gcj as it is getting deprecated OBS-URL: https://build.opensuse.org/package/show/Java:packages/bea-stax?expand=0&rev=17 --- bea-stax-gcj43-build.patch | 11 ----------- bea-stax.changes | 6 ++++++ bea-stax.spec | 8 ++------ 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 bea-stax-gcj43-build.patch diff --git a/bea-stax-gcj43-build.patch b/bea-stax-gcj43-build.patch deleted file mode 100644 index 8d2e6da..0000000 --- a/bea-stax-gcj43-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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()); } - diff --git a/bea-stax.changes b/bea-stax.changes index d655b09..e1d27c7 100644 --- a/bea-stax.changes +++ b/bea-stax.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 5 15:31:59 UTC 2017 - tchvatal@suse.com + +- Use java-devel and not gcj as it is getting deprecated +- Drop unused patch bea-stax-gcj43-build.patch + ------------------------------------------------------------------- Mon Sep 9 11:05:33 UTC 2013 - tchvatal@suse.com diff --git a/bea-stax.spec b/bea-stax.spec index b6e072c..c0c6fbd 100644 --- a/bea-stax.spec +++ b/bea-stax.spec @@ -1,7 +1,7 @@ # # spec file for package bea-stax # -# Copyright (c) 2013 SUSE LINUX Products 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 @@ -26,7 +26,6 @@ Group: Development/Libraries/Java 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-gcj43-build.patch Patch2: bea-stax-gcj-build.patch Name: bea-stax @@ -36,7 +35,7 @@ BuildArch: noarch BuildRequires: javapackages-tools %if %defined suse_version BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel BuildRequires: unzip #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap @@ -71,9 +70,6 @@ Streaming API for XML %prep %setup -q -c -n %{name}-%{version} %patch0 -b .target15 -%if %suse_version <= 1110 -%patch1 -b .gcj43-build -%endif %patch2 -b .gcj-build %build