From 7e69aa739674ba11e89d3df125725cb2fd2710865911a223e2f834074ec20f73 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 21 Sep 2017 11:42:47 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=252

---
 java-1_8_0-openjdk.changes | 5 +++++
 java-1_8_0-openjdk.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 3fb1fd2..b37c437 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 21 11:41:46 UTC 2017 - fstrba@suse.com
+
+- Allow bootstrapping by itself (BuildConflicts: java-deve >= 1.9)
+
 -------------------------------------------------------------------
 Sat Sep 16 07:29:20 UTC 2017 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 03e4119..a69c178 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -253,9 +253,9 @@ Provides:       jre1.7.x
 Provides:       jre1.8.x
 %if %{with bootstrap}
 BuildRequires:  java-devel >= 1.7
-BuildConflicts: java-devel >= 1.8
+BuildConflicts: java-devel >= 1.9
 %else
-BuildRequires:  java-1_8_0-openjdk-devel
+BuildRequires:  %{name}-devel
 %endif
 %if %{with_system_kerberos}
 BuildRequires:  krb5-devel
@@ -639,7 +639,7 @@ export NO_BRP_CHECK_BYTECODE_VERSION=true
   # Install systemtap support files.
   install -dm 755 %{buildroot}%{_jvmdir}/%{sdkdir}/tapset
   for i in tapset/*.stp; do
-    cp -a $i %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/$(basename $i .stp)-1.8.0.stp
+    cp -a $i %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/$(basename $i .stp)-%{javaver}.stp
   done
   install -d -m 755 %{buildroot}%{tapsetdir}
   pushd %{buildroot}%{tapsetdir}