[thermostat] Update to 0.3
Omair Majid
omajid at fedoraproject.org
Fri Jul 13 00:57:36 UTC 2012
commit 5c677fd7ed36e118c6514a26115769526af3808d
Author: Omair Majid <omajid at redhat.com>
Date: Thu Jul 12 20:55:21 2012 -0400
Update to 0.3
.gitignore | 1 +
fix-jfreechart-dep.patch | 54 ++++++++++++++++++++-----
fix-test-scopes.patch | 15 +++++++
ignore-missing-activator.patch | 12 ++++++
per-user-home.patch | 85 ++++++++++++++++++++++++++++------------
sources | 2 +-
thermostat.spec | 28 ++++++++++---
7 files changed, 154 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18e377d..eb66fb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/6f83cf36541d.tar.gz
/2140a7c81a4b.tar.gz
+/thermostat-0.3.tar.gz
diff --git a/fix-jfreechart-dep.patch b/fix-jfreechart-dep.patch
index 81e817a..763ed24 100644
--- a/fix-jfreechart-dep.patch
+++ b/fix-jfreechart-dep.patch
@@ -1,19 +1,18 @@
-diff -r 2140a7c81a4b client/pom.xml
---- a/client/pom.xml Thu May 03 23:20:47 2012 +0200
-+++ b/client/pom.xml Thu May 03 18:42:35 2012 -0400
-@@ -78,7 +78,7 @@
- <version>${project.version}</version>
+Fedora 17 has a jfreechart pom with groupId jfree rather than org.jfree
+--- a/client/core/pom.xml 2012-06-22 17:20:00.000000000 -0400
++++ b/client/core/pom.xml 2012-07-12 12:22:18.667513963 -0400
+@@ -97,7 +97,7 @@
+ <type>bundle</type>
</dependency>
<dependency>
- <groupId>org.jfree</groupId>
+ <groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
- </dependencies>
-diff -r 2140a7c81a4b pom.xml
---- a/pom.xml Thu May 03 23:20:47 2012 +0200
-+++ b/pom.xml Thu May 03 18:42:35 2012 -0400
-@@ -64,7 +64,7 @@
+
+--- a/pom.xml 2012-06-22 17:20:00.000000000 -0400
++++ b/pom.xml 2012-07-12 12:28:04.691523635 -0400
+@@ -65,7 +65,7 @@
<easymock.version>3.1</easymock.version>
<jdktools.version>1.7.0</jdktools.version>
@@ -21,4 +20,37 @@ diff -r 2140a7c81a4b pom.xml
+ <jfreechart.version>1.0.13</jfreechart.version>
<mongo-driver.version>2.7.3</mongo-driver.version>
<commons-cli.version>1.2</commons-cli.version>
-
+ <jline.version>2.5</jline.version>
+--- a/client/vmclassstat/pom.xml 2012-07-12 13:20:56.559612115 -0400
++++ b/client/vmclassstat/pom.xml 2012-07-12 13:21:04.294612399 -0400
+@@ -57,7 +57,7 @@
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.jfree</groupId>
++ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ </dependency>
+ <dependency>
+--- a/client/heapdumper/pom.xml 2012-07-12 14:20:19.793711484 -0400
++++ b/client/heapdumper/pom.xml 2012-07-12 14:20:25.670711675 -0400
+@@ -108,7 +108,7 @@
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+- <groupId>org.jfree</groupId>
++ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ </dependency>
+
+--- a/client/memory-stats-panel/pom.xml 2012-07-12 14:26:57.377722596 -0400
++++ b/client/memory-stats-panel/pom.xml 2012-07-12 14:27:06.863722872 -0400
+@@ -58,7 +58,7 @@
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.jfree</groupId>
++ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ </dependency>
+ <dependency>
diff --git a/fix-test-scopes.patch b/fix-test-scopes.patch
new file mode 100644
index 0000000..c279895
--- /dev/null
+++ b/fix-test-scopes.patch
@@ -0,0 +1,15 @@
+--- a/agent/command/pom.xml 2012-07-12 13:12:24.462597832 -0400
++++ b/agent/command/pom.xml 2012-07-12 13:12:39.780598326 -0400
+@@ -64,10 +64,12 @@
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
++ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
++ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
diff --git a/ignore-missing-activator.patch b/ignore-missing-activator.patch
new file mode 100644
index 0000000..690325a
--- /dev/null
+++ b/ignore-missing-activator.patch
@@ -0,0 +1,12 @@
+--- a/client/command/pom.xml 2012-07-12 14:34:11.257734702 -0400
++++ b/client/command/pom.xml 2012-07-12 14:34:25.671735107 -0400
+@@ -86,7 +86,9 @@
+ <configuration>
+ <instructions>
+ <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
++ <!--
+ <Bundle-Activator>com.redhat.thermostat.client.command.AgentConfigurationActivator</Bundle-Activator>
++ -->
+ <Export-Package>
+ com.redhat.thermostat.client.command
+ </Export-Package>
diff --git a/per-user-home.patch b/per-user-home.patch
index dbfc5e3..5ade155 100644
--- a/per-user-home.patch
+++ b/per-user-home.patch
@@ -20,70 +20,105 @@ diff --git a/distribution/scripts/thermostat-client-gui b/distribution/scripts/t
+. "${THERMOSTAT_HOME}"/bin/thermostat-init-layout
export THERMOSTAT_HOME
- THERMOSTAT_LIBS="${THERMOSTAT_HOME}/libs"
+ $THERMOSTAT_HOME/bin/thermostat gui
diff --git a/distribution/scripts/thermostat-init-layout b/distribution/scripts/thermostat-init-layout
--- a/distribution/scripts/thermostat-init-layout
+++ b/distribution/scripts/thermostat-init-layout
-@@ -35,23 +35,27 @@
- # to do so, delete this exception statement from your version.
+@@ -38,43 +38,83 @@
#
- #####################################################################
--#
-+
# Some necessary variables.
if [ "$THERMOSTAT_HOME" = "" ]; then
- echo "THERMOSTAT_HOME not set!"
+ THERMOSTAT_HOME="@thermostat.home@"
+fi
++
++USER_THERMOSTAT_HOME="${HOME}/.thermostat"
-else
- THERMOSTAT_STORAGE="${THERMOSTAT_HOME}/storage/db"
-- THERMOSTAT_LOG="${THERMOSTAT_HOME}/storage/log"
+- THERMOSTAT_LOG="${THERMOSTAT_HOME}/storage/logs"
- THERMOSTAT_PID="${THERMOSTAT_HOME}/storage/run"
- THERMOSTAT_BACKEND="${THERMOSTAT_HOME}/backends/system"
- THERMOSTAT_BIN="${THERMOSTAT_HOME}/bin"
- THERMOSTAT_AGENT_LOG="${THERMOSTAT_HOME}/agent/logs"
- THERMOSTAT_AGENT_RUN="${THERMOSTAT_HOME}/agent/run"
+- THEMROSTAT_CLIENT="${THERMOSTAT_HOME}/client"
- THERMOSTAT_LIBS="${THERMOSTAT_HOME}/libs"
-+USER_THERMOSTAT_HOME=${HOME}/.thermostat
-+
-+if [ ! -d "${USER_THERMOSTAT_HOME}" ] ; then
-+ THERMOSTAT_STORAGE="${USER_THERMOSTAT_HOME}/storage/db"
-+ THERMOSTAT_LOG="${USER_THERMOSTAT_HOME}/storage/logs"
-+ THERMOSTAT_PID="${USER_THERMOSTAT_HOME}/storage/run"
-+ THERMOSTAT_BACKEND="${USER_THERMOSTAT_HOME}/backends/system"
-+ THERMOSTAT_BIN="${USER_THERMOSTAT_HOME}/bin"
-+ THERMOSTAT_AGENT_LOG="${USER_THERMOSTAT_HOME}/agent/logs"
-+ THERMOSTAT_AGENT_RUN="${USER_THERMOSTAT_HOME}/agent/run"
-+ THERMOSTAT_LIBS="${USER_THERMOSTAT_HOME}/libs"
++THERMOSTAT_STORAGE="${USER_THERMOSTAT_HOME}/storage/db"
++THERMOSTAT_LOG="${USER_THERMOSTAT_HOME}/storage/logs"
++THERMOSTAT_PID="${USER_THERMOSTAT_HOME}/storage/run"
++THERMOSTAT_BACKEND="${USER_THERMOSTAT_HOME}/backends/system"
++THERMOSTAT_BIN="${USER_THERMOSTAT_HOME}/bin"
++THERMOSTAT_AGENT_LOG="${USER_THERMOSTAT_HOME}/agent/logs"
++THERMOSTAT_AGENT_RUN="${USER_THERMOSTAT_HOME}/agent/run"
++THERMOSTAT_CLIENT="${USER_THERMOSTAT_HOME}/client"
++THERMOSTAT_LIBS="${USER_THERMOSTAT_HOME}/libs"
++THERMOSTAT_ETC="${USER_THERMOSTAT_HOME}/etc"
++if [ ! -d "${THERMOSTAT_STORAGE}" ] ; then
echo "creating $THERMOSTAT_STORAGE"
mkdir -p $THERMOSTAT_STORAGE
-+ cp "${THERMOSTAT_HOME}"/storage/db.properties "${USER_THERMOSTAT_HOME}"/storage/
-
+-
++fi
++
++if [ ! -e "${USER_THERMOSTAT_HOME}/storage/db.properties" ] ; then
++ echo "copying over ${THERMOSTAT_HOME}/storage/db.properties"
++ cp "${THERMOSTAT_HOME}/storage/db.properties" "${USER_THERMOSTAT_HOME}/storage"
++fi
++
++if [ ! -d "${THERMOSTAT_LOG}" ] ; then
echo "creating $THERMOSTAT_LOG"
mkdir -p $THERMOSTAT_LOG
-@@ -61,16 +65,21 @@
++fi
++if [ ! -d "${THERMOSTAT_PID}" ] ; then
+ echo "creating $THERMOSTAT_PID"
+ mkdir -p $THERMOSTAT_PID
++fi
+
++if [ ! -d "${THERMOSTAT_BACKEND}" ] ; then
echo "creating $THERMOSTAT_BACKEND"
mkdir -p $THERMOSTAT_BACKEND
-+ cp "${THERMOSTAT_HOME}"/backends/system/backend.properties "${THERMOSTAT_BACKEND}"/
++fi
++
++if [ ! -e "${THERMOSTAT_BACKEND}/backend.properties" ] ; then
++ cp "${THERMOSTAT_HOME}/backends/system/backend.properties" "${THERMOSTAT_BACKEND}"
++fi
++if [ ! -e "${THERMOSTAT_BIN}" ] ; then
echo "creating $THERMOSTAT_BIN"
- mkdir -p $THERMOSTAT_BIN
-+ ln -s "${THERMOSTAT_HOME}/"bin $THERMOSTAT_BIN
++ ln -s "${THERMOSTAT_HOME}/bin" "${THERMOSTAT_BIN}"
++fi
++if [ ! -d "${THERMOSTAT_AGENT_LOG}" ] ; then
echo "creating $THERMOSTAT_AGENT_LOG"
mkdir -p $THERMOSTAT_AGENT_LOG
++fi
++if [ ! -d "${THERMOSTAT_AGENT_RUN}" ] ; then
echo "creating $THERMOSTAT_AGENT_RUN"
mkdir -p $THERMOSTAT_AGENT_RUN
++fi
+
++if [ ! -e "${USER_THERMOSTAT_HOME}/agent/agent.properties" ] ; then
+ cp "${THERMOSTAT_HOME}"/agent/agent.properties "${USER_THERMOSTAT_HOME}"/agent/agent.properties
-
++fi
+
++if [ ! -d "${THERMOSTAT_CLIENT}" ] ; then
+ echo "creating $THERMOSTAT_CLIENT"
+ mkdir -p "$THERMOSTAT_CLIENT"
++fi
+
++if [ ! -e "${THERMOSTAT_LIBS}" ] ; then
echo "creating $THERMOSTAT_LIBS"
- mkdir -p $THERMOSTAT_LIBS
+ ln -s "${THERMOSTAT_HOME}"/libs "$THERMOSTAT_LIBS"
fi
+
-+THERMOSTAT_HOME=${USER_THERMOSTAT_HOME}
++if [ ! -d "${THERMOSTAT_ETC}" ] ; then
++ echo "creating $THERMOSTAT_ETC"
++ ln -s "${THERMOSTAT_HOME}"/etc "$THERMOSTAT_ETC"
++fi
++
++THERMOSTAT_HOME="${USER_THERMOSTAT_HOME}"
diff --git a/sources b/sources
index 2dd4d82..29706ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53b942360a4dc2a0e42f8b4db7fa15eb 2140a7c81a4b.tar.gz
+41bc22901a644fd97a71167604eefd87 thermostat-0.3.tar.gz
diff --git a/thermostat.spec b/thermostat.spec
index 8e96699..5a3ae61 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -1,15 +1,16 @@
-%global changeset 2140a7c81a4b
-
Name: thermostat
-Version: 0.2
-Release: 0.20120506hg%{changeset}%{?dist}
+Version: 0.3
+Release: 1%{?dist}
Summary: A monitoring and serviceability tool for OpenJDK
License: GPLv2+ with exceptions
URL: http://icedtea.classpath.org/thermostat/
-Source0: http://icedtea.classpath.org/hg/thermostat/archive/%{changeset}.tar.gz
+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
BuildArch: noarch
@@ -21,6 +22,9 @@ BuildRequires: maven-dependency-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: felix-framework
+BuildRequires: felix-osgi-core
+BuildRequires: felix-osgi-compendium
BuildRequires: fusesource-pom
BuildRequires: jansi
BuildRequires: jfreechart
@@ -31,6 +35,9 @@ BuildRequires: mongo-java-driver-bson
Requires: java >= 1:1.7.0
Requires: jpackage-utils
+Requires: felix-framework
+Requires: felix-osgi-core
+Requires: felix-osgi-compendium
Requires: jansi
Requires: java-devel >= 1:1.7.0
Requires: jline2
@@ -59,9 +66,12 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}
%prep
-%setup -q -n thermostat-%{changeset}
+%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
mvn-rpmbuild \
@@ -88,6 +98,9 @@ cp -a distribution/target %{buildroot}%{_datarootdir}/%{name}
# symlink dependencies into the right directory
build-jar-repository -s -p %{buildroot}%{_datarootdir}/%{name}/libs \
+ felix/org.apache.felix.framework \
+ felix/org.osgi.core \
+ felix/org.osgi.compendium \
commons-cli \
hawtjni-runtime \
jansi \
@@ -139,6 +152,9 @@ cp -a target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Thu Jul 12 2012 Omair Majid <omajid at redhat.com> - 0.3-1
+- Update to upstream 0.3 release
+
* Sun May 06 2012 Omair Majid <omajid at redhat.com> - 0.2-0.20120506hg2140a7c81a4b
- Resolve RH813539
- Remove uneeded require on fusesource-pom
More information about the scm-commits
mailing list