[thermostat/f21] Rebuild for updated jcommon/jfreechart versions.
jerboaa
jerboaa at fedoraproject.org
Wed Sep 3 15:56:01 UTC 2014
commit 0af8803a200ba01f7dc0f174f8ba33efd2dddc0b
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Tue Sep 2 18:05:45 2014 +0200
Rebuild for updated jcommon/jfreechart versions.
thermostat.spec | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index dabc8c8..e62b690 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -8,8 +8,8 @@
# Real OSGi Bundle-Version is 3.6.6.Final
%global netty_bundle_version 3.6.6
-%global jcommon_bundle_version 1.0.18
-%global jfreechart_bundle_version 1.0.14
+%global jcommon_bundle_version 1.0.23
+%global jfreechart_bundle_version 1.0.19
# apache-commons-beanutils
%global beanutils_bundle_version 1.9.2
# apache-commons-codec
@@ -80,7 +80,7 @@ Name: %{?scl_prefix}thermostat
Version: %{major}.%{minor}.%{patchlevel}
# If building from snapshot out of hg, uncomment and adjust below value as appropriate
#Release: 0.1.20131122hg%{hgrev}%{?dist}
-Release: 4.1%{?dist}
+Release: 4.2%{?dist}
Summary: A monitoring and serviceability tool for OpenJDK
License: GPLv2+ with exceptions and OFL
URL: http://icedtea.classpath.org/thermostat/
@@ -178,9 +178,7 @@ BuildRequires: mvn(org.apache.commons:commons-fileupload)
# as specified in thermostat's bundle list has
# a chance of working at runtime.
###################################################
-# 1.0.14-7 has OSGi metadata and itext dep fix
BuildRequires: osgi(org.jfree.jfreechart) = %{jfreechart_bundle_version}
-# 1.0.17-4 has OSGi metadata
BuildRequires: osgi(org.jfree.jcommon) = %{jcommon_bundle_version}
BuildRequires: osgi(org.apache.commons.logging) = %{logging_bundle_version}
BuildRequires: osgi(org.apache.commons.beanutils) = %{beanutils_bundle_version}
@@ -591,7 +589,7 @@ ln -s %{system_javadir}/netty3-3.6.6.jar %{buildroot}%{thermostat_home}/libs/net
ln -s %{system_javadir}/mongo-java-driver.jar %{buildroot}%{thermostat_home}/libs/mongo-java-driver.jar
# The following deps are packaged as part of the thermostat-scl
ln -s %{scl_javadir}/jfreechart/jfreechart.jar %{buildroot}%{thermostat_home}/libs/jfreechart.jar
-ln -s %{scl_javadir}/jcommon.jar %{buildroot}%{thermostat_home}/libs/jcommon.jar
+ln -s %{scl_javadir}/jcommon/jcommon.jar %{buildroot}%{thermostat_home}/libs/jcommon.jar
ln -s %{scl_javadir}/jline/jline.jar %{buildroot}%{thermostat_home}/libs/jline2.jar
ln -s %{scl_javadir}/lucene/lucene-core.jar %{buildroot}%{thermostat_home}/libs/lucene.jar
ln -s %{scl_javadir}/lucene/lucene-analyzers-common.jar %{buildroot}%{thermostat_home}/libs/lucene-analyzers.jar
@@ -850,6 +848,9 @@ end
%config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
%changelog
+* Tue Sep 02 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.4-4.2
+- Rebuild for updated jcommon/jfreechart versions.
+
* Tue Aug 19 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.4-4.1
- Rebuild for updated httpcomponents-client version (v4.3.5).
More information about the scm-commits
mailing list