SHA256
1
0
forked from pool/appframework

Accepting request 526280 from Java:packages

Fix build with jdk9

OBS-URL: https://build.opensuse.org/request/show/526280
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/appframework?expand=0&rev=17
This commit is contained in:
2017-09-15 20:31:36 +00:00
committed by Git OBS Bridge
3 changed files with 27 additions and 3 deletions

View File

@@ -0,0 +1,13 @@
--- AppFramework-1.03/nbproject/project.properties 2007-09-20 17:29:34.000000000 +0200
+++ AppFramework-1.03/nbproject/project.properties 2017-09-15 09:37:41.694825604 +0200
@@ -28,8 +28,8 @@
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
+javac.source=1.6
+javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\

View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 15 07:41:38 UTC 2017 - fstrba@suse.com
- Added patch:
* appframework-sourcetarget.patch
+ fix build with jdk9: specify java source and target 1.6
- Clean spec file and fix some rpmlint warnings
-------------------------------------------------------------------
Sun May 21 08:04:59 UTC 2017 - tchvatal@suse.com

View File

@@ -26,10 +26,13 @@ Url: https://appframework.dev.java.net/
Source0: https://appframework.dev.java.net/downloads/AppFramework-%{version}-src.tar.bz2
Patch0: %{name}-%{version}-no-local-storage.diff
Patch1: %{name}-%{version}-openjdk.diff
Patch2: %{name}-sourcetarget.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-tools
BuildRequires: swing-layout >= 1.0.3
Requires: java
Requires: java >= 1.6
Requires: swing-layout >= 1.0.3
BuildArch: noarch
@@ -51,6 +54,7 @@ small set of Java classes that simplify building desktop applications.
find . -name "*.jar" -exec rm -f {} \;
%patch0 -b .sav
%patch1 -p1 -b .sav
%patch2 -p1 -b .sav
%build
ant -Dlibs.swing-layout.classpath=%{_javadir}/swing-layout.jar dist
@@ -63,14 +67,13 @@ ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%fdupes %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(-,root,root,-)
%{_javadir}/*
%doc COPYING README
%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name}/*