[thermostat] Disable self-BR and conditionalize mongodb-server requires.
jerboaa
jerboaa at fedoraproject.org
Mon Jan 26 13:23:57 UTC 2015
commit 14d84651156ed1477333100bedad57b7e269ed69
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Mon Jan 26 14:20:35 2015 +0100
Disable self-BR and conditionalize mongodb-server requires.
thermostat.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index 38ff9f2..7d514e2 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -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: 3%{?dist}
+Release: 4%{?dist}
Summary: A monitoring and serviceability tool for OpenJDK
License: GPLv2+ with exceptions and OFL
URL: http://icedtea.classpath.org/thermostat/
@@ -124,7 +124,7 @@ Patch4: fix_assembly_filtering.patch
# Self-BR in order for xmvn-subst to work for symlinking
# thermostat deps.
-BuildRequires: thermostat-webapp = %{version}
+#BuildRequires: thermostat-webapp = %{version}
# BRs for core thermostat
BuildRequires: java-devel >= 1:1.8.0
BuildRequires: javapackages-tools
@@ -197,7 +197,10 @@ BuildRequires: osgi(org.apache.httpcomponents.httpmime) = %{hc_client_bundle_ver
Requires: java >= 1:1.8.0
Requires: jpackage-utils
Requires: java-devel >= 1:1.8.0
+# Only require mongodb-server on arches where it's available
+%ifarch %{arm} %{ix86} x86_64
Requires: mongodb-server
+%endif
Requires: libgnome-keyring
Requires(post): systemd
Requires(preun): systemd
@@ -767,6 +770,9 @@ end
%config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
%changelog
+* Mon Jan 26 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.0-4
+- Disable self-BR and conditionalize mongodb-server requires.
+
* Fri Jan 23 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.0-3
- BR thermostat in order for xmvn-subst to properly generate
symlinks to own jars. Using jars from same reactor does not yet
More information about the scm-commits
mailing list