[jing-trang] Fix build and depend on headless JRE on EL7 (Jan Pokorný).

Ville Skyttä scop at fedoraproject.org
Mon Nov 25 17:09:10 UTC 2013


commit 3091d22edcaf2a8a12b386382aabd54167026f4a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Nov 25 19:08:59 2013 +0200

    Fix build and depend on headless JRE on EL7 (Jan Pokorný).

 jing-trang.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/jing-trang.spec b/jing-trang.spec
index 63a4cac..7395f2a 100644
--- a/jing-trang.spec
+++ b/jing-trang.spec
@@ -3,13 +3,13 @@
 # - Drop isorelax and xerces license texts and references to them because
 #   our package does not actually contain them?
 
-%if 0%{?fedora} >= 20
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
 %global headless -headless
 %endif
 
 Name:           jing-trang
 Version:        20091111
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Schema validation and conversion based on RELAX NG
 
 Group:          Applications/Text
@@ -31,7 +31,7 @@ Patch3:         %{name}-20091111-saxon93-716177.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires:  ant-trax
 %else
 BuildRequires:  ant >= 1.8.2
@@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 25 2013 Ville Skyttä <ville.skytta at iki.fi> - 20091111-16
+- Fix build and depend on headless JRE on EL7 (Jan Pokorný).
+
 * Fri Oct 25 2013 Ville Skyttä <ville.skytta at iki.fi> - 20091111-15
 - Depend on headless JRE where available.
 


More information about the scm-commits mailing list