Accepting request 522115 from Java:packages

Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/522115
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cal10n?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2017-09-13 20:19:31 +00:00 committed by Git OBS Bridge
commit ac674d2e4f
3 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,37 @@
--- cal10n-0.7.7/cal10n-api/maven-build.xml 2017-09-07 19:31:22.268263921 +0200
+++ cal10n-0.7.7/cal10n-api/maven-build.xml 2017-09-07 19:43:32.588627010 +0200
@@ -67,10 +67,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.5"
+ target="1.6"
verbose="false"
fork="false"
- source="1.5">
+ source="1.6">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
@@ -95,10 +95,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.5"
+ target="1.6"
verbose="false"
fork="false"
- source="1.5">
+ source="1.6">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
@@ -202,7 +202,7 @@
charset="ISO-8859-1"
linksource="false"
breakiterator="false">
- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+ <link href="http://java.sun.com/j2se/1.6.0/docs/api"/>
<group title="CAL10N API packages"/>
<group title="CAL10N Maven plugin"/>
</javadoc>

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Sep 7 17:45:17 UTC 2017 - fstrba@suse.com
- Added patch:
* cal10n-0.7.7-sourcetarget.patch
- Force java source and target levels to 1.6 in order to allow
building with jdk9
-------------------------------------------------------------------
Thu Dec 25 14:23:44 UTC 2014 - p.drouand@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package cal10n
#
# Copyright (c) 2014 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
@ -25,6 +25,7 @@ Group: Development/Libraries/Java
Url: http://cal10n.qos.ch
Source0: http://cal10n.qos.ch/dist/cal10n-%{version}.tar.gz
Source1: build.xml-0.7.7.tar.xz
Patch0: cal10n-0.7.7-sourcetarget.patch
BuildRequires: ant
BuildRequires: java-devel
BuildRequires: junit
@ -54,6 +55,7 @@ API documentation for %{name}.
%prep
%setup -q
tar -xf %{SOURCE1}
%patch0 -p1
find . -name "*.jar" | xargs rm
# bnc#759912