[will-crash/el6] use correct java packages on EL6

Richard Marko rmarko at fedoraproject.org
Fri Dec 5 15:46:48 UTC 2014


commit 745bd04e4794b7ff5056027199ddbed44571e5f9
Author: Richard Marko <rmarko at fedoraproject.org>
Date:   Fri Dec 5 16:11:18 2014 +0100

    use correct java packages on EL6
    
    Signed-off-by: Richard Marko <rmarko at fedoraproject.org>

 will-crash.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/will-crash.spec b/will-crash.spec
index 5fde219..9b45ab8 100644
--- a/will-crash.spec
+++ b/will-crash.spec
@@ -1,6 +1,6 @@
 Name:           will-crash
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Set of crashing executables written in various languages
 
 Group:          Development/Tools
@@ -15,8 +15,13 @@ BuildRequires:  libtool
 BuildRequires:  gcc-c++
 Requires:       ruby
 Requires:       python
+%if 0%{?rhel} && 0%{?rhel} == 6
+Requires:       java-1.8.0-openjdk-headless
+Requires:       jpackage-utils
+%else
 Requires:       java-headless >= 1.7.0.0
 Requires:       javapackages-tools
+%endif
 
 # Don't require python3 for el6/el7, exclude ppc64 due to missing java
 %if 0%{?rhel}
@@ -71,6 +76,9 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
 %{_libdir}/libwilljavasegfault.so*
 
 %changelog
+* Fri Dec 05 2014 Richard Marko <rmarko at fedoraproject.org> - 0.9-3
+- fix java deps for EL6
+
 * Mon Nov 24 2014 Richard Marko <rmarko at fedoraproject.org> - 0.9-2
 - fix will_java_throw_suppressed availability on RHEL6
 


More information about the scm-commits mailing list