From 3a3c5ee569ca33a0d4cccf206521c3eaae497e3c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2015 07:10:01 +0000
Subject: import thermostat1-jline2-2.10-70.3.el7


---

diff --git a/SPECS/jline2.spec b/SPECS/jline2.spec
index 120a6ed..0a89e53 100644
--- a/SPECS/jline2.spec
+++ b/SPECS/jline2.spec
@@ -1,6 +1,9 @@
 %{?scl:%scl_package jline2}
 %{!?scl:%global pkg_name %{name}}
 
+# Use java common's requires/provides generator
+%{?java_common_find_provides_and_requires}
+
 # Exclude generation of osgi() style provides, since they are not
 # SCL-namespaced and may conflict with base RHEL packages.
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=1045447
@@ -12,7 +15,7 @@ Version:          2.10
 # 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}
+Release:          70.3%{?dist}
 Summary:          JLine is a Java library for handling console input
 Group:            Development/Libraries
 License:          BSD and ASL 2.0
@@ -24,17 +27,15 @@ Source0:          jline-%{version}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    maven-local
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-surefire-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    junit4
-BuildRequires:    jansi
-BuildRequires:    fusesource-pom
-BuildRequires:    maven-surefire-provider-junit4
-
-Requires:         jansi
+BuildRequires:    %{?scl_prefix_java_common}maven-local
+BuildRequires:    %{?scl_prefix_maven}maven-compiler-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-jar-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-surefire-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-install-plugin
+BuildRequires:    %{?scl_prefix_java_common}junit
+BuildRequires:    %{?scl_prefix_java_common}jansi
+BuildRequires:    %{?scl_prefix_maven}fusesource-pom
+BuildRequires:    %{?scl_prefix_maven}maven-surefire-provider-junit
 
 %{?scl:Requires: %scl_runtime}
 
@@ -54,7 +55,7 @@ Group:            Documentation
 This package contains the API documentation for %{name}.
 
 %prep
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %setup -q -n jline-%{version}
 
 # Remove maven-shade-plugin usage
@@ -75,12 +76,12 @@ This package contains the API documentation for %{name}.
 %{?scl:EOF}
 
 %build
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %mvn_build
 %{?scl:EOF}
 
 %install
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %mvn_install
 %{?scl:EOF}
 
@@ -92,6 +93,13 @@ This package contains the API documentation for %{name}.
 %doc LICENSE.txt
 
 %changelog
+* Mon Jan 19 2015 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.3
+- Use java common's libs as BR.
+
+* Thu Dec 18 2014 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.2
+- Use maven30 collection for building.
+- Use java common's requires/provides generators.
+
 * Mon Jun 23 2014 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.1
 - Add requires for thermostat1-runtime package.