1
0
Fridrich Strba 2017-09-21 11:42:47 +00:00 committed by Git OBS Bridge
parent f247d03384
commit 7e69aa7396
2 changed files with 8 additions and 3 deletions

View File

@ -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

View File

@ -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}