Accepting request 529001 from Java:packages
Fix build with jdk9 OBS-URL: https://build.opensuse.org/request/show/529001 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jline?expand=0&rev=21
This commit is contained in:
commit
185ebc6f1c
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 27 16:55:31 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Don't require java-1_5_0-gcj-compat, but build with any
|
||||
java-devel provider
|
||||
- Specify java source and target level 1.6: fixes build with
|
||||
jdk9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 9 09:35:59 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
|
@ -28,11 +28,12 @@ Source1: CatalogManager.properties
|
||||
Source2: jline-build.xml
|
||||
Source3: jline-0.9.94.pom
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xml-commons-resolver
|
||||
#!BuildIgnore: antlr antlr-java
|
||||
#!BuildIgnore: antlr
|
||||
#!BuildIgnore: antlr-java
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -70,7 +71,7 @@ export CLASSPATH=`pwd`/build
|
||||
cd src/
|
||||
export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes
|
||||
export OPT_JAR_LIST=:
|
||||
ant jar
|
||||
ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar
|
||||
|
||||
%install
|
||||
# jars
|
||||
@ -79,7 +80,6 @@ install -p -m 644 src/target/jline.jar %{buildroot}%{_javadir}/%{name}-%{version
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_javadir}/%{name}-%{version}.jar
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user