[jettison/el5] Drop the requirement for java* >= 1.6.0 for EL <= 5
Sandro Mathys
red at fedoraproject.org
Sun Jan 15 16:09:31 UTC 2012
commit 3211529188dde2a1e9b67b495bcfc2bd1c86e1dc
Author: Sandro Mathys <red at fedoraproject.org>
Date: Sun Jan 15 17:06:00 2012 +0100
Drop the requirement for java* >= 1.6.0 for EL <= 5
jettison.spec | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/jettison.spec b/jettison.spec
index 5fcdb11..fcff68b 100644
--- a/jettison.spec
+++ b/jettison.spec
@@ -1,6 +1,6 @@
Name: jettison
Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A JSON StAX implementation
Group: Development/Libraries
License: ASL 2.0
@@ -9,9 +9,14 @@ Source0: http://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{ver
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?rhel} <= 5
+BuildRequires: java-devel
+Requires: java
+%else
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
Requires: java >= 1:1.6.0
+%endif
+BuildRequires: jpackage-utils
Requires: jpackage-utils
%description
@@ -72,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 15 2012 Sandro Mathys <red at fedoraproject.org> - 1.3.1-2
+- Drop the requirement for java* >= 1.6.0 for EL <= 5
+
* Sun Jan 15 2012 Sandro Mathys <red at fedoraproject.org> - 1.3.1-1
- New upstream release
More information about the scm-commits
mailing list