From ab352df1d23578b8bc712806033e39dc76475407 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2014 09:13:55 +0000
Subject: import thermostat1-jline2-2.10-70.1.el7


---

diff --git a/SPECS/jline2.spec b/SPECS/jline2.spec
index 5c99af9..120a6ed 100644
--- a/SPECS/jline2.spec
+++ b/SPECS/jline2.spec
@@ -8,7 +8,11 @@
 
 Name:             %{?scl_prefix}jline2
 Version:          2.10
-Release:          13%{?dist}
+# Release should be higher than el6 builds. Use convention
+# 60.X where X is an increasing int. 60 for rhel-6. We use
+# 70.X for rhel-7. For some reason we cannot rely on the
+# dist tag.
+Release:          70.1%{?dist}
 Summary:          JLine is a Java library for handling console input
 Group:            Development/Libraries
 License:          BSD and ASL 2.0
@@ -20,8 +24,6 @@ Source0:          jline-%{version}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
 BuildRequires:    maven-jar-plugin
@@ -32,8 +34,6 @@ BuildRequires:    jansi
 BuildRequires:    fusesource-pom
 BuildRequires:    maven-surefire-provider-junit4
 
-Requires:         jpackage-utils
-Requires:         java
 Requires:         jansi
 
 %{?scl:Requires: %scl_runtime}
@@ -48,7 +48,7 @@ JLine to be familiar.
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
+%{?scl:Requires: %scl_runtime}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -86,12 +86,15 @@ This package contains the API documentation for %{name}.
 
 %files -f .mfiles
 %doc CHANGELOG.md README.md LICENSE.txt
-%dir %{_javadir}/%{name}
+%dir %{_javadir}/%{pkg_name}
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
 %changelog
+* Mon Jun 23 2014 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.1
+- Add requires for thermostat1-runtime package.
+
 * Mon Jan 27 2014 Severin Gehwolf <sgehwolf@redhat.com> - 2.10-13
 - Own scl-ized jline2 directory in javadir.
 - Resolves: RHBZ#1057169