[icedtea-web] Fix FTBFS

Omair Majid omajid at fedoraproject.org
Mon Jun 9 20:08:26 UTC 2014


commit 24e53dc8c4b0ebbbcc0f5e51a19210d7f66069c4
Author: Omair Majid <omajid at redhat.com>
Date:   Mon Jun 9 16:07:38 2014 -0400

    Fix FTBFS
    
    Require junit instead of juni4
    Build against OpenJDK 7 explicitly

 icedtea-web.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/icedtea-web.spec b/icedtea-web.spec
index 59c7f35..9c5ae96 100644
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@ -10,8 +10,8 @@
 %define priority 17000
 
 
-%define javadir     %{_jvmdir}/java-openjdk
-%define jredir      %{_jvmdir}/jre-openjdk
+%define javadir     %{_jvmdir}/java-1.7.0-openjdk
+%define jredir      %{_jvmdir}/jre-1.7.0-openjdk
 %define javaplugin  libjavaplugin.so.%{_arch}
 
 %define binsuffix      .itweb
@@ -34,7 +34,7 @@ BuildRequires:  glib2-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  xulrunner-devel
-BuildRequires:  junit4
+BuildRequires:  junit
 # new in 1.5 to have  clean up for malformed XMLs
 BuildRequires:  tagsoup
 
@@ -155,6 +155,10 @@ exit 0
 %doc COPYING
 
 %changelog
+* Mon Jun 09 2014 Omair Majid <omajid at redhat.com> - 1.5-3
+- Require junit instead of juni4
+- Build against OpenJDK 7 explicitly
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list