- Build with java-devel and not gcj as it is getting deprecated

- Add patch to build with new javac:
  * build-encoding.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/bcel?expand=0&rev=23
This commit is contained in:
Tomáš Chvátal 2017-01-05 15:29:47 +00:00 committed by Git OBS Bridge
parent 1a44e44db2
commit f9ed3b6df5
3 changed files with 32 additions and 2 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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 Wed Mar 25 09:22:33 UTC 2015 - tchvatal@suse.com

View File

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

20
build-encoding.patch Normal file
View File

@ -0,0 +1,20 @@
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>