diff --git a/SPECS/jfreechart.spec b/SPECS/jfreechart.spec index f0324ad..456cd26 100644 --- a/SPECS/jfreechart.spec +++ b/SPECS/jfreechart.spec @@ -8,7 +8,11 @@ Name: %{?scl_prefix}jfreechart Version: 1.0.14 -Release: 14%{?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: Java chart library Group: Development/Libraries @@ -17,9 +21,9 @@ URL: http://www.jfree.org/jfreechart/ Source0: http://download.sourceforge.net/sourceforge/jfreechart/%{pkg_name}-%{version}.tar.gz Source1: bnd.properties -Requires: servlet java jpackage-utils +Requires: servlet java Requires: %{?scl_prefix}jcommon >= 1.0.17 -BuildRequires: %{requires} ant java-devel servlet +BuildRequires: %{requires} ant servlet %if 0%{?fedora} BuildRequires: eclipse-swt %endif @@ -49,8 +53,7 @@ Experimental swt extension for jfreechart. %package javadoc Summary: Javadocs for %{name} Group: Documentation -Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils +%{?scl:Requires: %scl_runtime} %description javadoc This package contains the API documentation for %{name}. @@ -119,6 +122,10 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{pkg_name}-%{pkg_nam %{_javadocdir}/%{pkg_name} %changelog +* Mon Jun 23 2014 Severin Gehwolf 1.0.14-70.1 +- Fix dependency on scl-runtime. +- Bump release number to allow for in-place upgrade. + * Fri Dec 20 2013 Severin Gehwolf 1.0.14-14 - Don't generate osgi() style provides. - Resolves: RHBZ#1045437.