[thermostat] - Removed now obsolete patch (with jfreechart updated to 1.0.14) - Added BR

jerboaa jerboaa at fedoraproject.org
Thu Jul 19 15:45:39 UTC 2012


commit 247a96be14d222677efcb2687cc63d199e2d0578
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Jul 19 17:44:08 2012 +0200

    - Removed now obsolete patch (with jfreechart updated to 1.0.14)
    - Added BR

 fix-jfreechart-dep.patch |   56 ----------------------------------------------
 thermostat.spec          |   30 +++++++++++++++++-------
 2 files changed, 21 insertions(+), 65 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index 80d5c39..e64d4ac 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -1,16 +1,18 @@
 Name:       thermostat
 Version:    0.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions
 URL:        http://icedtea.classpath.org/thermostat/
+# Should we use something like this for rawhide? I.e. push
+# a build every so often based on a HG revision
+#Source0:    http://icedtea.classpath.org/hg/thermostat/archive/0.3.tar.bz2
 Source0:    http://icedtea.classpath.org/download/%{name}/%{name}-%{version}.tar.gz
 
-Patch0:     fix-jfreechart-dep.patch
-Patch1:     per-user-home.patch
-Patch2:     fix-test-scopes.patch
-Patch3:     ignore-missing-activator.patch
-Patch4:     follow-lib-symlinks.patch
+Patch0:     per-user-home.patch
+Patch1:     fix-test-scopes.patch
+Patch2:     ignore-missing-activator.patch
+Patch3:     follow-lib-symlinks.patch
 
 BuildArch:  noarch
 
@@ -27,11 +29,18 @@ BuildRequires: felix-osgi-core
 BuildRequires: felix-osgi-compendium
 BuildRequires: fusesource-pom
 BuildRequires: jansi
-BuildRequires: jfreechart
+BuildRequires: jfreechart >= 1.0.14
 BuildRequires: jline2
 BuildRequires: mongo-java-driver
 BuildRequires: mongo-java-driver-bson
 BuildRequires: netty
+# Not sure if we need this as Requires as well
+# --------------------------------------------
+# Could not resolve dependencies for project
+# com.redhat.thermostat:thermostat-client-core:bundle:0.3:
+# The repository system is offline but the artifact com.lowagie:itext:jar:2.1.5
+# is not available in the local repository.
+BuildRequires: itext-core
 
 Requires: java >= 1:1.7.0
 Requires: jpackage-utils
@@ -42,7 +51,7 @@ Requires: felix-osgi-compendium
 Requires: jansi
 Requires: java-devel >= 1:1.7.0
 Requires: jline2
-Requires: jfreechart
+Requires: jfreechart >= 1.0.14
 Requires: mongodb
 Requires: mongodb-server
 Requires: mongo-java-driver
@@ -73,7 +82,6 @@ This package contains the API documentation for %{name}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 mvn-rpmbuild \
@@ -154,6 +162,10 @@ cp -a target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jul 19 2012 Severin Gehwolf <sgehwolf at redhat.com> 0.3-2
+- Removed now obsolete patch (with jfreechart updated to 1.0.14)
+- Added BR
+
 * Thu Jul 12 2012 Omair Majid <omajid at redhat.com> - 0.3-1
 - Update to upstream 0.3 release
 


More information about the scm-commits mailing list