From 15d9cc15cb1754f9217f4b980a1e1b4d2038cbdb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2014 09:12:56 +0000 Subject: import thermostat1-jcommon-1.0.18-70.1.el7 --- diff --git a/SPECS/jcommon.spec b/SPECS/jcommon.spec index 6ce36a4..1629ceb 100644 --- a/SPECS/jcommon.spec +++ b/SPECS/jcommon.spec @@ -8,21 +8,25 @@ Name: %{?scl_prefix}jcommon Version: 1.0.18 -Release: 5%{?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: 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, java-devel, jpackage-utils +BuildRequires: ant # Required for converting jars to OSGi bundles BuildRequires: aqute-bnd -Requires: java, jpackage-utils -BuildArch: noarch - +Requires: java %{?scl:Requires: %scl_runtime} +BuildArch: noarch + %description JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects. @@ -30,8 +34,7 @@ JFreeChart, JFreeReport and other projects. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils +%{?scl:Requires: %scl_runtime} %description javadoc Javadoc for %{name}. @@ -40,7 +43,7 @@ Javadoc for %{name}. Summary: JFree XML utility classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Requires: java, jpackage-utils +%{?scl:Requires: %scl_runtime} %description xml Optional XML utility classes. @@ -83,6 +86,9 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{pkg_name}.pom %{_javadocdir}/%{pkg_name} %changelog +* Mon Jun 23 2014 Severin Gehwolf 1.0.18-70.1 +- Add requires for thermostat1-runtime package. + * Fri Dec 20 2013 Severin Gehwolf 1.0.18-5 - Don't generate osgi() style provides. - Resolves: RHBZ#1045436.