[thermostat] Some spec-file housekeeping.

jerboaa jerboaa at fedoraproject.org
Tue Jun 10 14:34:01 UTC 2014 

commit 2351396f4de3a0ab1eb4b37382a5e63528cdc3ad
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Tue Jun 10 16:15:23 2014 +0200

    Some spec-file housekeeping.
    
    - Drop manual requires in favour of mvn()-style auto-requires.
    - Switch to mvn()-style BRs.
    - Use io.netty:netty over org.jboss.netty:netty in order to keep
      thermostat installable. Fixes netty3 auto-requires bug.

 thermostat.spec |   76 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 43 insertions(+), 33 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index bf36e82..f9c344d 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:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions and OFL
 URL:        http://icedtea.classpath.org/thermostat/
@@ -126,6 +126,7 @@ Patch3:     ignore_bundle_versions.patch
 #      http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1694
 Patch4:     update-to-lucene-4.7.0.patch
 
+# BRs for core thermostat
 BuildRequires:  java-devel >= 1:1.7.0
 BuildRequires:  jpackage-utils
 BuildRequires: maven-local
@@ -141,26 +142,35 @@ BuildRequires: maven-assembly-plugin
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-javadoc-plugin
 BuildRequires: libgnome-keyring-devel
-BuildRequires: felix-framework
-BuildRequires: fusesource-pom
 # laf-utils JNI need pkconfig files for gtk2+
 BuildRequires: gtk2-devel
-# Use tomcat only for web storage
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: apache-commons-cli
-BuildRequires: jline >= 2.5-7
-BuildRequires: jansi
+BuildRequires: mvn(org.apache.felix:org.apache.felix.framework)
+BuildRequires: mvn(org.fusesource:fusesource-pom:pom:)
+BuildRequires: mvn(org.apache.commons:commons-cli)
+# jline 2.10 is known to work
+BuildRequires: mvn(jline:jline) >= 2.10
+BuildRequires: mvn(org.fusesource.jansi:jansi)
 # Lucene 4.7.0-2 has the BREE fix which made thermostat
 # to not boot at all.
+#
 # lucene a bootstrap bundle, eh? nonesense!
-BuildRequires: lucene >= 4.7.0-2
-BuildRequires: lucene-analysis >= 4.7.0-2
-BuildRequires: apache-commons-fileupload
-# Change to netty once RHBZ#1053619 is
+# See: http://icedtea.classpath.org/hg/thermostat/rev/9f495243fcd7
+BuildRequires: mvn(org.apache.lucene:lucene-core) >= 4.7.0
+BuildRequires: mvn(org.apache.lucene:lucene-analyzers) >= 4.7.0
+BuildRequires: mvn(com.google.code.gson:gson)
+BuildRequires: mvn(org.jfree:jfreechart)
+BuildRequires: mvn(org.jfree:jcommon)
+BuildRequires: mvn(org.apache.commons:commons-beanutils)
+BuildRequires: mvn(org.mongodb:mongo-java-driver)
+# Change to netty 4 once RHBZ#1053619 is
 # resolved.
-BuildRequires: netty3
-# Required for webapp sub-package
+# The version number in mvn() means it's a compat package.
+BuildRequires: mvn(io.netty:netty:3.6.6)
+
+# BRs for webapp sub-package
 BuildRequires: tomcat
+BuildRequires: mvn(javax.servlet:servlet-api) >= 2.5
+BuildRequires: mvn(org.apache.commons:commons-fileupload)
 
 ###################################################
 # The following BRs are specified via osgi's
@@ -185,9 +195,7 @@ BuildRequires: osgi(org.apache.httpcomponents.httpmime) = %{hc_client_bundle_ver
 
 Requires: java >= 1:1.7.0
 Requires: jpackage-utils
-Requires: felix-framework
 Requires: java-devel >= 1:1.7.0
-Requires: mongodb
 Requires: mongodb-server
 Requires: libgnome-keyring
 Requires(post): systemd
@@ -198,28 +206,18 @@ Requires(postun): systemd
 # (self-contained within thermostat) we can remove this again.
 # See RHBZ#966892
 Requires: gnome-icon-theme
-Requires: jansi
-# jline 2.5-7 has jansi-internal import-package fix.
-Requires: jline >= 2.5-7
-Requires: apache-commons-cli
-# lucene 3.6.0-6 has fixed osgi metadata
-Requires: lucene >= 3.6.0-6
 ###################################################
 # The following Rs are specified via osgi's
 # symbolic name. This is to ensure exact versions
 # 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
 Requires: osgi(org.jfree.jfreechart) >= %{jfreechart_bundle_version}
-# 1.0.17-4 has OSGi metadata
 Requires: osgi(org.jfree.jcommon) >= %{jcommon_bundle_version}
 Requires: osgi(org.apache.commons.logging) >= %{logging_bundle_version}
 Requires: osgi(org.apache.commons.beanutils) >= %{beanutils_bundle_version}
 Requires: osgi(org.apache.commons.codec) >= %{codec_bundle_version}
 Requires: osgi(org.mongodb.mongo-java-driver) >= %{mongo_bundle_version}
-# Change to netty once RHBZ#1053619 has been resolved
-Requires: netty3
 Requires: osgi(org.jboss.netty) = %{netty_bundle_version}
 Requires: osgi(com.google.gson) >= %{gson_bundle_version}
 Requires: osgi(org.apache.httpcomponents.httpcore) >= %{hc_core_bundle_version}
@@ -255,7 +253,6 @@ BuildArch:  noarch
 # This version will allow custom catalina-base/systemd stuff as
 # we do it.
 Requires:   tomcat >= 7.0.42-3
-Requires:   apache-commons-fileupload
 Requires:   %{name} = %{version}-%{release}
 
 %description webapp
@@ -294,6 +291,14 @@ security.
 # need jline 2.10 (otherwise this resolves to jline 1)
 %pom_xpath_remove "pom:properties/pom:jline.version"
 %pom_xpath_inject "pom:properties" "<jline.version>2.10</jline.version>"
+#  netty
+#%pom_remove_dep org.jboss.netty:netty 
+%pom_remove_dep org.jboss.netty:netty common/command
+%pom_remove_dep org.jboss.netty:netty client/command
+%pom_remove_dep org.jboss.netty:netty agent/command
+%pom_add_dep io.netty:netty:3.6.6 common/command
+%pom_add_dep io.netty:netty:3.6.6 client/command
+%pom_add_dep io.netty:netty:3.6.6 agent/command
 
 # Don't use maven-exec-plugin. We do things manually in order to avoid this
 # additional dep. It's used in agent/core/pom.xml and in keyring/pom.xml
@@ -582,16 +587,15 @@ ln -s %{system_javadir}/apache-commons-cli.jar %{buildroot}%{thermostat_home}/li
 ln -s %{system_javadir}/apache-commons-collections.jar %{buildroot}%{thermostat_home}/libs/commons-collections.jar
 ln -s %{system_javadir}/apache-commons-beanutils.jar %{buildroot}%{thermostat_home}/libs/commons-beanutils.jar
 ln -s %{system_javadir}/apache-commons-logging.jar %{buildroot}%{thermostat_home}/libs/commons-logging.jar
-ln -s %{system_javadir}/netty3-3.jar %{buildroot}%{thermostat_home}/libs/netty.jar
-ln -s %{system_javadir}/mongo.jar %{buildroot}%{thermostat_home}/libs/mongo.jar
-ln -s %{system_javadir}/tomcat-servlet-api.jar %{buildroot}%{thermostat_home}/libs/javax-servlet.jar
+ln -s %{system_javadir}/netty3-3.6.6.jar %{buildroot}%{thermostat_home}/libs/netty.jar
+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}/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
-ln -s %{scl_javadir}/google-gson.jar %{buildroot}%{thermostat_home}/libs/gson.jar
+ln -s %{scl_javadir}/google-gson/gson.jar %{buildroot}%{thermostat_home}/libs/gson.jar
 # The following are additional Fedora specific symlinks for transitive deps
 #   see fix_bundle_loading.patch
 # some of them have their deps embedded upstream (or whatever is available in the maven repos)
@@ -704,10 +708,10 @@ ln -s %{system_javadir}/apache-commons-collections.jar
 ln -s %{system_javadir}/apache-commons-beanutils.jar
 ln -s %{system_javadir}/apache-commons-logging.jar
 ln -s %{system_javadir}/apache-commons-io.jar
-ln -s %{system_javadir}/mongo.jar
+ln -s %{system_javadir}/mongo-java-driver.jar
 ln -s %{system_javadir}/apache-commons-codec.jar
 ln -s %{scl_javadir}/apache-commons-fileupload.jar
-ln -s %{scl_javadir}/google-gson.jar
+ln -s %{scl_javadir}/google-gson/gson.jar
 popd
 
 # We use a custom CATALINA_BASE with core tomcat directories
@@ -846,6 +850,12 @@ end
 %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
 
 %changelog
+* Tue Jun 10 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.4-3
+- Drop manual requires in favour of mvn()-style auto-requires.
+- Switch to mvn()-style BRs.
+- Use io.netty:netty over org.jboss.netty:netty in order to keep
+  thermostat installable.
+
 * Fri Jun 06 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.4-2
 - Rebuild for updated httpcomonents-client (v4.3.4) and
   apache-commons-beanutils (v1.9.2) builds.

More information about the scm-commits mailing list