1
0

Accepting request 264409 from home:fstrba:branches:Java:packages

Add Java9 compatibility

OBS-URL: https://build.opensuse.org/request/show/264409
OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=18
This commit is contained in:
Fridrich Strba 2014-12-08 13:11:27 +00:00 committed by Git OBS Bridge
parent 92694b00fc
commit bbc4d90adb
3 changed files with 24 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- javapackages-2.0.1/install 2013-07-26 09:25:31.000000000 +0200
+++ javapackages-2.0.1/install 2014-12-08 14:00:11.726036951 +0100
@@ -94,7 +94,7 @@
dir "${rpmconfigdir}/fileattrs"
-for ver in 1.5.0 1.6.0 1.7.0 1.8.0; do
+for ver in 1.5.0 1.6.0 1.7.0 1.8.0 1.9.0; do
dir "${javadir}-${ver}"
dir "${jnidir}-${ver}"
done

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Dec 8 13:02:05 UTC 2014 - fstrba@suse.com
- Added patch:
* javapackages-2.0.1-java9.patch: create directories for java,
so that ant build works
- Add virtual provide jpackage-utils-java9 to be able to
distinguish the presence of java9 compatibility
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 16 11:12:00 UTC 2014 - Led <ledest@gmail.com> Thu Oct 16 11:12:00 UTC 2014 - Led <ledest@gmail.com>

View File

@ -37,6 +37,8 @@ Patch1: depgen.patch
# PATCH-FIX-SLE maven_depmap-no-attribute-exit.patch - fix ZipFile instance has no attribute '__exit__' # PATCH-FIX-SLE maven_depmap-no-attribute-exit.patch - fix ZipFile instance has no attribute '__exit__'
Patch2: maven_depmap-no-attribute-exit.patch Patch2: maven_depmap-no-attribute-exit.patch
Patch3: javapackages-2.0.1-fix-bashisms.patch Patch3: javapackages-2.0.1-fix-bashisms.patch
# PATCH-FIX-OPENSUSE javapackages-2.0.1-java9.patch - add directories for java9
Patch4: javapackages-2.0.1-java9.patch
#BuildArch: noarch #BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -57,6 +59,7 @@ Requires: python
Requires: python-xml Requires: python-xml
Provides: jpackage-utils = %{version}-%{release} Provides: jpackage-utils = %{version}-%{release}
Provides: jpackage-utils-java9
Obsoletes: jpackage-utils <= 1.7.5 Obsoletes: jpackage-utils <= 1.7.5
%description %description
@ -110,6 +113,7 @@ This package provides macros and scripts to support packaging Maven artifacts.
%patch2 -p1 %patch2 -p1
%endif %endif
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
%{configure} %{configure}