- Cleanup a bit and remove unused patch bea-stax-gcj43-build.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/bea-stax?expand=0&rev=19

bea-stax-gcj43-build.patch

@@ -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()); }
- 

bea-stax.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun May 21 08:15:12 UTC 2017 - tchvatal@suse.com
+
+- Cleanup a bit and remove unused patch bea-stax-gcj43-build.patch
+
 -------------------------------------------------------------------
 Mon Sep  9 11:05:33 UTC 2013 - tchvatal@suse.com
 

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
@@ -16,47 +16,35 @@
 #
 
 
-%define name            bea-stax
-%define version         1.2.0
-%define release         0.rc1.2jpp
 %define section         free
+Name:           bea-stax
+Version:        1.2.0
+Release:        0
 Summary:        Streaming API for XML
 License:        Apache-2.0
 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
-Version:        %{version}
-Release:        0
-BuildArch:      noarch
-BuildRequires:  javapackages-tools
-%if %defined suse_version
 BuildRequires:  ant
 BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  javapackages-tools
 BuildRequires:  unzip
-#BuildRequires:  xerces-j2-bootstrap
 #!BuildIgnore:  xerces-j2-bootstrap
+#!BuildIgnore:  antlr antlr-java
+#!BuildIgnore:  xerces-j2 xml-commons xml-commons-apis xml-commons-resolver xml-commons-which
+#!BuildIgnore:  xml-commons-jaxp-1.3-apis
 BuildRequires:  xml-commons-apis-bootstrap
 BuildRequires:  xml-commons-resolver-bootstrap
 BuildRequires:  xml-commons-which-bootstrap
-#!BuildIgnore: antlr antlr-java
-#!BuildIgnore:  xerces-j2 xml-commons xml-commons-apis xml-commons-resolver xml-commons-which
-#!BuildIgnore:  xml-commons-jaxp-1.3-apis
-%endif
 Requires:       %{name}-api = %{version}-%{release}
-Requires:       javapackages-tools
+BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The Streaming API for XML (StAX) is a groundbreaking new Java API for
 parsing and writing XML easily and efficiently.
 
-
-
 %package api
 Summary:        The StAX API
 Group:          Development/Libraries/Java
@@ -64,16 +52,11 @@ Group:          Development/Libraries/Java
 %description api
 Streaming API for XML
 
-
-
 %{summary}
 
 %prep
-%setup -q -c -n %{name}-%{version}
+%setup -q -c
 %patch0 -b .target15
-%if %suse_version <= 1110
-%patch1 -b .gcj43-build
-%endif
 %patch2 -b .gcj-build
 
 %build
@@ -81,17 +64,14 @@ ant all
 
 %install
 # jar
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 0755 %{buildroot}%{_javadir}
-install -p -m 0644 build/stax-api-1.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
+install -p -m 0644 build/stax-api-1.0.jar %{buildroot}%{_javadir}/%{name}-api-%{version}.jar
-install -p -m 0644 build/stax-1.2.0_rc1-dev.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-ri-%{version}.jar
+install -p -m 0644 build/stax-1.2.0_rc1-dev.jar %{buildroot}%{_javadir}/%{name}-ri-%{version}.jar
-ln -s %{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
+ln -s %{name}-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar
-ln -s %{name}-ri-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-ri.jar
+ln -s %{name}-ri-%{version}.jar %{buildroot}%{_javadir}/%{name}-ri.jar
 
 %files
 %defattr(-,root,root,-)
-#%{_docdir}/%{name}-%{version}/BEA*.doc
-#%{_docdir}/%{name}-%{version}/README.txt
-#%{_datadir}/%{name}-%{version}
 %{_javadir}/%{name}-ri-%{version}.jar
 %{_javadir}/%{name}-ri.jar