Accepting request 456867 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/456867
OBS-URL: https://build.opensuse.org/package/show/Java:packages/bcel?expand=0&rev=24

bcel.changes

@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Thu Jan  5 15:28:49 UTC 2017 - tchvatal@suse.com
-
-- Build with java-devel and not gcj as it is getting deprecated
-- Add patch to build with new javac:
-  * build-encoding.patch
-
 -------------------------------------------------------------------
 Wed Mar 25 09:22:33 UTC 2015 - tchvatal@suse.com
 

bcel.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bcel
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,10 +26,8 @@ Url:            http://commons.apache.org/proper/commons-bcel/
 Source0:        http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz
 Source1:        http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz.asc
 Source2:        bcel.keyring
-# set encoding for javac as otherwise it gets interpreted as utf8 and fail
-Patch0:         build-encoding.patch
 BuildRequires:  ant
-BuildRequires:  java-devel
+BuildRequires:  java-1_5_0-gcj-compat-devel
 BuildRequires:  regexp
 #BuildRequires:  xerces-j2-bootstrap
 #!BuildIgnore:  xml-commons-apis xml-commons-resolver xml-commons xerces-j2
@@ -71,7 +69,6 @@ find . -name "*.jar" -exec rm -f {} \;
 # very broken build
 perl -p -i -e 's| depends=\"examples\"||g;' build.xml
 touch manifest.txt
-%patch0 -p1
 
 %build
 export CLASSPATH=%(build-classpath regexp)

build-encoding.patch

@@ -1,20 +0,0 @@
-Index: bcel-5.2/build.xml
-===================================================================
---- bcel-5.2.orig/build.xml
-+++ bcel-5.2/build.xml
-@@ -39,7 +39,7 @@
-   <target name="compile" description="o Compile the code" depends="get-deps">
-     <mkdir dir="${classesdir}">
-     </mkdir>
--    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-+    <javac destdir="${classesdir}" deprecation="true" encoding="iso-8859-1" debug="true" optimize="false" excludes="**/package.html">
-       <src>
-         <pathelement location="src/java">
-         </pathelement>
-@@ -121,4 +121,4 @@
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-     </unjar>
-   </target>
--</project>
-\ No newline at end of file
-+</project>