From 7cba97881f82a0f16bbaee5ba53c0a30f11d65ae Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2015 07:10:57 +0000
Subject: import thermostat1-jcommon-1.0.18-70.5.el7


---

diff --git a/SPECS/jcommon.spec b/SPECS/jcommon.spec
index 1629ceb..d449919 100644
--- a/SPECS/jcommon.spec
+++ b/SPECS/jcommon.spec
@@ -1,6 +1,9 @@
 %{?scl:%scl_package jcommon}
 %{!?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=1045436
@@ -12,16 +15,17 @@ Version: 1.0.18
 # 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.5%{?dist}
 Summary: JFree Java utility classes
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://downloads.sourceforge.net/jfreechart/%{pkg_name}-%{version}.tar.gz
 Source2: bnd.properties
 URL: http://www.jfree.org/jcommon
-BuildRequires:  ant
+BuildRequires:  %{?scl_prefix_java_common}javapackages-local
+BuildRequires:  %{?scl_prefix_java-common}ant
 # Required for converting jars to OSGi bundles
-BuildRequires:  aqute-bnd
+BuildRequires:  %{?scl_prefix_maven}aqute-bnd
 Requires: java
 %{?scl:Requires: %scl_runtime}
 
@@ -49,43 +53,52 @@ Requires: %{name} = %{version}-%{release}
 Optional XML utility classes.
 
 %prep
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %setup -q -n %{pkg_name}-%{version}
 find . -name "*.jar" -exec rm -f {} \;
+%mvn_file org.jfree:%{pkg_name} %{pkg_name}
+%{?scl:EOF}
 
 %build
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 pushd ant
 ant compile compile-xml javadoc
 popd
 # Convert to OSGi bundle
 java -Djcommon.bundle.version="%{version}" \
      -jar $(build-classpath aqute-bnd) wrap -output %{pkg_name}-%{version}.bar -properties %{SOURCE2} %{pkg_name}-%{version}.jar
+mv %{pkg_name}-%{version}.bar %{pkg_name}-%{version}.jar
+%mvn_artifact pom.xml %{pkg_name}-%{version}.jar
+%{?scl:EOF}
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p %{pkg_name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}.jar
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
+%mvn_install -J javadoc
 cp -p %{pkg_name}-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}-xml.jar
+%{?scl:EOF}
 
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}
-cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}
-
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{pkg_name}.pom
-
-%add_maven_depmap JPP-%{pkg_name}.pom %{pkg_name}.jar
-
-%files
+%files -f .mfiles
 %doc licence-LGPL.txt README.txt
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/%{pkg_name}.jar
 
 %files xml
 %{_javadir}/%{pkg_name}-xml.jar
 
-%files javadoc
-%{_javadocdir}/%{pkg_name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Jan 19 2015 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.5
+- Switch BR to rh-java-common's ant.
+
+* Fri Jan 09 2015 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.4
+- Rebuild for properly generated requires/provides.
+
+* Thu Jan 08 2015 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.3
+- Make it buildable with latest xmvn (2.2.x).
+
+* Thu Dec 18 2014 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.2
+- Build with maven collection.
+- Use java common's provides/requires generators.
+
 * Mon Jun 23 2014 Severin Gehwolf <sgehwolf@redhat.com> 1.0.18-70.1
 - Add requires for thermostat1-runtime package.