From 9ae9802e4c9b314f06b2dfe45b2938e2d053bb4b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2014 09:10:54 +0000 Subject: import thermostat1-thermostat-1.0.4-70.3.el7 --- diff --git a/.gitignore b/.gitignore index 7baeae1..41d629a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/thermostat-1.0.2.tar.gz +SOURCES/thermostat-1.0.4.tar.gz diff --git a/.thermostat1-thermostat.metadata b/.thermostat1-thermostat.metadata index 0a4f82b..7d15419 100644 --- a/.thermostat1-thermostat.metadata +++ b/.thermostat1-thermostat.metadata @@ -1 +1 @@ -f247021c435e39dfa759b877ddce58f0e6ed632e SOURCES/thermostat-1.0.2.tar.gz +6c42c87ab6d341cd9350b033529b9a96ca2f2caa SOURCES/thermostat-1.0.4.tar.gz diff --git a/SPECS/thermostat.spec b/SPECS/thermostat.spec index fe7965d..0020698 100644 --- a/SPECS/thermostat.spec +++ b/SPECS/thermostat.spec @@ -1,7 +1,7 @@ # Thermostat version %global major 1 %global minor 0 -%global patchlevel 2 +%global patchlevel 4 # Real OSGi Bundle-Version is 3.6.6.Final %global netty_bundle_version 3.6.3 %global jcommon_bundle_version 1.0.18 @@ -81,9 +81,11 @@ 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: 1%{?dist} +# Release should be higher than el6 builds. Use convention +# 60.X where X is an increasing int. 60 for rhel-6. We use +# 70.X for rhel-7. For some reason we cannot rely on the +# dist tag. +Release: 70.3%{?dist} Summary: A monitoring and serviceability tool for OpenJDK License: GPLv2+ with exceptions and OFL URL: http://icedtea.classpath.org/thermostat/ @@ -123,9 +125,6 @@ Patch2: fix_loglevel.patch # work. See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1591 Patch3: ignore_bundle_versions.patch -BuildRequires: java-devel >= 1:1.7.0 -BuildRequires: jpackage-utils - BuildRequires: maven-local BuildRequires: xmvn BuildRequires: maven-dependency-plugin @@ -146,8 +145,8 @@ BuildRequires: tomcat-servlet-3.0-api # Bootstrap bundles (started via file name) BuildRequires: apache-commons-cli -BuildRequires: %{?scl_prefix}jline2 >= 2.5-7 BuildRequires: jansi +BuildRequires: %{?scl_prefix}jline2 >= 2.5-7 # SCL-carried OSGi bundles BuildRequires: %{?scl_prefix}jfreechart >= 1.0.14-7 @@ -166,41 +165,18 @@ BuildRequires: httpcomponents-client # Mongodb Java driver comes from the mongodb collection BuildRequires: mongodb24 BuildRequires: mongodb24-mongo-java-driver -BuildRequires: mongodb24-mongo-java-driver-bson # The following BR is SCL only %{?scl:BuildRequires: tomcat} -Requires: java >= 1:1.7.0 -Requires: java-devel >= 1:1.7.0 -Requires: jpackage-utils -Requires: felix-framework -Requires: jansi +# Required for main thermostat script, tools.jar etc. +Requires: java-1.7.0-openjdk-devel Requires: libgnome-keyring -# jline2 2.5-7 has jansi-internal import-package fix. -Requires: %{?scl_prefix}jline2 >= 2.5-7 -# 1.0.14-3 has OSGi metadata (itext fix is for BR only, -# since it was only maven complaining about missing dep) -Requires: %{?scl_prefix}jfreechart >= 1.0.14-3 -# 1.0.17-4 has OSGi metadata -Requires: %{?scl_prefix}jcommon >= 1.0.17-4 -Requires: %{?scl_prefix}netty -# lucene 3.6.0-6 has fixed osgi metadata -Requires: %{?scl_prefix}lucene >= 3.6.0-6 -Requires: %{?scl_prefix}google-gson -Requires: apache-commons-logging -Requires: apache-commons-beanutils -Requires: apache-commons-cli -Requires: apache-commons-codec -Requires: httpcomponents-core -Requires: httpcomponents-client # Things coming from the mongodb24 collection Requires: mongodb24 Requires: mongodb24-mongodb Requires: mongodb24-mongodb-server -Requires: mongodb24-mongo-java-driver -Requires: mongodb24-mongo-java-driver-bson Requires(post): systemd Requires(preun): systemd @@ -220,7 +196,7 @@ which is included out of the box. %package javadoc Summary: Javadocs for %{name} Group: Documentation -Requires: jpackage-utils +%{?scl:Requires: %scl_runtime} BuildArch: noarch @@ -475,15 +451,15 @@ mkdir -p %{buildroot}%{_datarootdir}/applications # have the '-i' switch. %mvn_install -rm -rf %{buildroot}%{_datarootdir}/java/%{?scl_prefix}%{pkg_name} +rm -rf %{buildroot}%{_datarootdir}/java/%{pkg_name} # now make xmvn happy, it expects version-less thermostat jars in # %{_datadir}/java/%{pkg_name} -mkdir -p %{buildroot}%{_datarootdir}/java/%{?scl_prefix}%{pkg_name} +mkdir -p %{buildroot}%{_datarootdir}/java/%{pkg_name} for i in $(cat distribution/symlink-map-filenames); do s=$(echo $i | cut -d'#' -f1) t=$(echo $i | cut -d'#' -f2) - ln -s %{_datarootdir}/%{pkg_name}/$s %{buildroot}%{_datarootdir}/java/%{?scl_prefix}%{pkg_name}/$t + ln -s %{_datarootdir}/%{pkg_name}/$s %{buildroot}%{_datarootdir}/java/%{pkg_name}/$t done pushd distribution/target/image/libs @@ -555,9 +531,9 @@ ln -s /opt/rh/mongodb24/root/usr/share/java/mongo.jar %{buildroot}%{thermostat_h ln -s %{scl_javadir}/netty.jar %{buildroot}%{thermostat_home}/libs/netty.jar 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}/%{scl_prefix}jline2/jline.jar %{buildroot}%{thermostat_home}/libs/jline2.jar +ln -s %{scl_javadir}/jline2/jline.jar %{buildroot}%{thermostat_home}/libs/jline2.jar ln -s %{scl_javadir}/lucene.jar %{buildroot}%{thermostat_home}/libs/lucene.jar -ln -s %{scl_javadir}/%{scl_prefix}google-gson/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 downstream 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) @@ -633,7 +609,7 @@ cp -r webstorage-webapp %{buildroot}%{thermostat_catalina_base}/webapps/%{pkg_na pushd %{buildroot}%{thermostat_catalina_base}/webapps/%{pkg_name}/WEB-INF/lib for i in thermostat-*.jar; do newFileName=$(echo $i | sed 's/-\([0-9]\+\.\)\+[0-9]\+\(-[a-zA-Z0-9]\+\)\?//') - ln -s %{thermostat_catalina_base}/webapps/%{pkg_name}/WEB-INF/lib/$i %{buildroot}%{_datarootdir}/java/%{?scl_prefix}%{pkg_name}/$newFileName + ln -s %{thermostat_catalina_base}/webapps/%{pkg_name}/WEB-INF/lib/$i %{buildroot}%{_datarootdir}/java/%{pkg_name}/$newFileName done popd @@ -674,8 +650,8 @@ ln -s %{system_javadir}/apache-commons-codec.jar # This comes from the mongodb24 collection. ln -s /opt/rh/mongodb24/root/usr/share/java/mongo.jar # The following are SCL-ized in our collection -ln -s %{scl_javadir}/%{scl_prefix}apache-commons-fileupload/commons-fileupload.jar apache-commons-fileupload.jar -ln -s %{scl_javadir}/%{scl_prefix}google-gson/gson.jar google-gson.jar +ln -s %{scl_javadir}/apache-commons-fileupload/commons-fileupload.jar apache-commons-fileupload.jar +ln -s %{scl_javadir}/google-gson/gson.jar google-gson.jar popd # We use a custom CATALINA_BASE with core tomcat directories @@ -716,6 +692,19 @@ JAVA="$(grep 'JAVA=' %{buildroot}/%{thermostat_home}/bin/thermostat | cut -d= -f test "${JAVA}" = "%{jdk_base}/bin/java" JAVA="$(grep 'JAVA=' %{buildroot}/%{thermostat_home}/bin/thermostat-agent-proxy | cut -d= -f2 | cut -d\" -f2)" test "${JAVA}" = "%{jdk_base}/bin/java" +# Be sure that symlinks to dependencies are not dangling. This might +# prevent thermostat from booting. For example see RHBZ#1119757 +# The 'grep -v %{version}.jar' is so as to not check for thermostat +# jar symlinks which aren't installed at build time. +# +# Verify symlinks in the thermostat package. +for i in $(ls -l %{buildroot}%{thermostat_home}/libs | grep ^l | grep -v '%{version}.jar' | cut -d'>' -f2); do + ls $i +done +# Verify symlinks in the thermostat-webapp package +for i in $(ls -l %{buildroot}%{thermostat_catalina_base}/webapps/%{pkg_name}/WEB-INF/lib | grep ^l | grep -v '%{version}.jar' | cut -d'>' -f2); do + ls $i +done %pre # add the thermostat user and group @@ -792,10 +781,10 @@ fi %attr(0770,thermostat,thermostat) %dir %{system_statedir} # Agent-proxy installs into jni_dir, but we symlink to it in # java_dir. Own the symlink here. -%{_javadir}/%{?scl_prefix}%{pkg_name}/thermostat-agent-proxy-server.jar +%{_javadir}/%{pkg_name}/thermostat-agent-proxy-server.jar # Own directories we ship libs in. See RHBZ#1057169 -%dir %{_jnidir}/%{name} -%dir %{_javadir}/%{name} +%dir %{_jnidir}/%{pkg_name} +%dir %{_javadir}/%{pkg_name} %files javadoc %doc LICENSE @@ -816,6 +805,19 @@ fi %attr(0770,tomcat,tomcat) %dir %{_root_localstatedir}/log/%{thermostat_tomcat_service_name} %changelog +* Tue Jul 15 2014 Severin Gehwolf - 1.0.4-70.3 +- Fix dangling symlinks for jline2, google-gson and apache-commons-fileupload + dependencies. +- Resolves: RHBZ#1119757 + +* Tue Jul 15 2014 Severin Gehwolf - 1.0.4-70.2 +- Add requires for java-1.7.0-openjdk-devel and libgnome-keyring. +- Resolves: RHBZ#1119669 + +* Tue Jun 24 2014 Severin Gehwolf - 1.0.4-70.1 +- Update to latest upstream bugfix release (v1.0.4). +- Depend on mvn()-style auto-requires over manual requires. + * Fri Feb 14 2014 Severin Gehwolf - 1.0.2-1 - Update to latest upstream release. - Also fixes RHBZ#1045016 (Keyring issue).