java-packages/netcomponents
SHA256
7
0
Fork 0
forked from pool/netcomponents
Code Pull Requests Activity

Accepting request 527348 from Java:packages

Browse Source 
Fix build with jdk9

OBS-URL: https://build.opensuse.org/request/show/527348
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netcomponents?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger
2017-09-20 15:12:55 +00:00
committed by Git OBS Bridge
parent 34064464e1 5cd4a9ae44
commit 557bf92b62
3 changed files with 14 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
netcomponents-java14compat.patch
View File

@@ -1,39 +1,3 @@
Nur in NetComponents-1.3.8: build.
diff -ru NetComponents-1.3.8.orig/build.xml NetComponents-1.3.8/build.xml
--- NetComponents-1.3.8.orig/build.xml 2001-11-30 04:20:12.000000000 +0100
+++ NetComponents-1.3.8/build.xml 2007-07-23 21:13:39.462024000 +0200
@@ -33,7 +33,9 @@
excludes="examples/**"
debug="${build.debug}"
deprecation="${build.deprecation}"
- optimize="${build.optimize}"/>
+ optimize="${build.optimize}"
+ source="1.4"
+ target="1.4" />
</target>
<!-- examples target. Compiles the example classes. -->
@@ -44,7 +46,9 @@
destdir="${build.dir}/examples"
debug="${build.debug}"
deprecation="${build.deprecation}"
- optimize="${build.optimize}"/>
+ optimize="${build.optimize}"
+ source="1.4"
+ target="1.4"/>
</target>
<!-- jar target. Compiles the source directory and creates a .jar file -->
@@ -68,7 +72,8 @@
windowtitle="${name} ${version} API"
doctitle="${name} ${version} API"
header="&lt;map name=&apos;_logoMap&apos;&gt;&lt;area href=&apos;http://www.savarese.org/&apos; alt=&apos;Savarese.Org Home&apos; shape=rect coords=&apos;0,0,66,14&apos;&gt;&lt;area href=&apos;http://www.savarese.org/oro/&apos; alt=&apos;ORO Home&apos;shape=rect coords=&apos;0,15,66,70&apos;&gt;&lt;/map&gt;&lt;img src=&apos;{@docroot}/../images/soroLogo.gif&apos; alt=&apos;Savarese.Org/ORO Logo&apos; width=67 height=71 align=left border=0 hspace=1 vspace=0 usemap=&apos;#_logoMap&apos;&gt;"
- bottom="${copyright.message}">
+ bottom="${copyright.message}"
+ source="1.4">
<!--
overview="${build.src.dir}/com/oroinc/overview.html"
-->
diff -ru NetComponents-1.3.8.orig/src/java/com/oroinc/net/ftp/FTP.java NetComponents-1.3.8/src/java/com/oroinc/net/ftp/FTP.java
--- NetComponents-1.3.8.orig/src/java/com/oroinc/net/ftp/FTP.java 2001-11-30 04:20:12.000000000 +0100
+++ NetComponents-1.3.8/src/java/com/oroinc/net/ftp/FTP.java 2007-07-23 21:10:49.091561000 +0200

9
netcomponents.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Sep 19 15:38:03 UTC 2017 - fstrba@suse.com
- Specify java source and target level 1.6: fix jdk9 build
- Modified patch:
* netcomponents-java14compat.patch
+ Don't hardcode java source and target levels, specify them
on command-line.
-------------------------------------------------------------------
Sat May 20 18:19:26 UTC 2017 - tchvatal@suse.com

9
netcomponents.spec
View File

@@ -26,8 +26,8 @@ Url: http://www.savarese.org/java/
Source: http://www.savarese.org/downloads/NetComponents/NetComponents-1.3.8-src.tar.gz
Patch0: %{name}-java14compat.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: xml-commons-apis
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -69,7 +69,9 @@ This package contains the javadoc documentation for netcomponents.
%patch0 -p1
%build
ant jar javadocs
ant \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
jar javadocs
%install
# jar
@@ -79,14 +81,13 @@ cp -p build/lib/NetComponents-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{v
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
%doc CHANGES README COPYRIGHT LICENSE
%{_javadir}/*
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%changelog