commit ce0f7662cf6ca2fc9961d3a84621363b9af9ff3c
Author: Jan Palus <[email protected]>
Date: Sun Oct 22 16:34:50 2017 +0200
add support for java9; rel 8
java9 no longer uses "1.9.0" versioning scheme but ie "9.0.1". Therefore
common java9 dir is no longer named java-1.9.0 but java-9 instead.
java_version.patch | 5 +++--
jpackage-utils.spec | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 56345b8..49fb510 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -3,7 +3,7 @@ Summary: JPackage utilities
Summary(pl.UTF-8): Narzędzia JPackage
Name: jpackage-utils
Version: 1.7.5
-Release: 7
+Release: 8
License: BSD-like
Group: Development/Languages/Java
Source0: %{name}-%{version}.tar.bz2
@@ -99,13 +99,13 @@ rm -rf $RPM_BUILD_ROOT
# arch independant
install -d
$RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/java,/etc/env.d,%{_javadocdir},%{_javasrcdir},%{_javadir}}
\
$RPM_BUILD_ROOT{%{_jvmsysconfdir},%{_jvmcommondatadir},%{_jvmdatadir},%{_jvmcommonsysconfdir}}
\
-
$RPM_BUILD_ROOT%{_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0,1.7.0,1.8.0}
\
+
$RPM_BUILD_ROOT%{_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0,1.7.0,1.8.0,9}
\
$RPM_BUILD_ROOT%{_mavendepmapdir}
# arch dependant
install -d \
$RPM_BUILD_ROOT{%{_jvmdir},%{_jvmjardir},%{_jvmprivdir},%{_jvmcommonlibdir},%{_jnidir}}
\
-
$RPM_BUILD_ROOT%{_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0,1.7.0,1.8.0}
+
$RPM_BUILD_ROOT%{_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0,1.7.0,1.8.0,9}
%if "%{_lib}" != "lib"
%define _ujvmdir %{_prefix}/lib/jvm
@@ -117,7 +117,7 @@ install -d \
install -d \
$RPM_BUILD_ROOT{%{_ujvmdir},%{_ujvmjardir},%{_ujvmprivdir},%{_ujvmcommonlibdir},%{_ujnidir}}
\
-
$RPM_BUILD_ROOT%{_ujnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0,1.7.0,1.8.0}
+
$RPM_BUILD_ROOT%{_ujnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0,1.7.0,1.8.0,9}
%endif
install -pm 755 bin/* $RPM_BUILD_ROOT%{_bindir}
diff --git a/java_version.patch b/java_version.patch
index fb99ad7..27a29e2 100644
--- a/java_version.patch
+++ b/java_version.patch
@@ -1,14 +1,15 @@
diff -dur jpackage-utils-1.7.5.orig/java-utils/java-functions
jpackage-utils-1.7.5/java-utils/java-functions
--- jpackage-utils-1.7.5.orig/java-utils/java-functions 2015-10-07
10:31:46.000000000 +0200
+++ jpackage-utils-1.7.5/java-utils/java-functions 2015-10-07
10:32:36.000000000 +0200
-@@ -145,8 +145,8 @@
+@@ -145,8 +145,9 @@
# Yuck, "grep -o" would be cleaner, but requires GNU grep >= 2.5.
# This could be improved/simplified if sed had non-greedy matching.
JAVA_VERSION=$($JAVACMD $opt 2>&1 | sed -n \
- -e '/java \(full \)*version "/s/'"$re"'/<<<\1>>>/' \
- -e '/java \(full \)*version "/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p')
+ -e '/\(java\|openjdk\) \(full \)*version "/s/'"$re"'/<<<\1>>>/' \
-+ -e '/\(java\|openjdk\) \(full \)*version
"/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p')
++ -e '/\(java\|openjdk\) \(full \)*version
"/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p') \
++ | sed '/^1\./!s/^\([[:digit:]]\{1,\}\).*/\1/'
if [ -n "$JAVA_VERSION" ] ; then
break
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jpackage-utils.git/commitdiff/ce0f7662cf6ca2fc9961d3a84621363b9af9ff3c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
