pool/bcel
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 529838 from Java:packages

Browse Source 
Trying to fix some cycles

OBS-URL: https://build.opensuse.org/request/show/529838
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bcel?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2017-09-29 09:54:32 +00:00 committed by Git OBS Bridge
commit 90a26fca0f
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bcel-5.2-encoding.patch Normal file
View File

@ -0,0 +1,11 @@
--- bcel-5.2/build.xml 2017-09-27 18:59:57.110434113 +0200
+++ bcel-5.2/build.xml 2017-09-27 19:00:39.286692143 +0200
@@ -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" debug="true" optimize="false" encoding="ISO-8859-1" excludes="**/package.html">
<src>
<pathelement location="src/java">
</pathelement>

9
bcel.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 27 17:05:58 UTC 2017 - fstrba@suse.com
- Allow building with any java-devel provider
- Specify java source and target level 1.6 to fix build with jdk9
- Added patch:
* bcel-5.2-encoding.patch
+ specify the correct encoding of the files
-------------------------------------------------------------------
Fri May 19 16:56:30 UTC 2017 - tchvatal@suse.com

30
bcel.spec
View File

@ -26,20 +26,18 @@ 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
Patch0: bcel-5.2-encoding.patch
BuildRequires: ant
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: java-devel
BuildRequires: regexp
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2
#!BuildIgnore: xml-commons-jaxp-1.3-apis
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
#!BuildIgnore: xerces-j2
#!BuildIgnore: xerces-j2-bootstrap
#!BuildIgnore: xml-commons
#!BuildIgnore: xml-commons-apis
#!BuildIgnore: xml-commons-jaxp-1.3-apis
#!BuildIgnore: xml-commons-resolver
Requires: regexp
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@ -66,6 +64,7 @@ standard JVM message.
%prep
%setup -q
%patch0 -p1
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
# very broken build
@ -75,8 +74,14 @@ touch manifest.txt
%build
export CLASSPATH=%(build-classpath regexp)
export OPT_JAR_LIST="ant/ant-nodeps"
ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} compile
ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} jar
ant \
-Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \
-Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \
compile
ant \
-Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \
-Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \
jar
%install
# jars
@ -85,7 +90,6 @@ install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{v
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_javadir}/*