From 60e4a14f81c78b11262da34a453f80b5ad7727fc Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 04 2015 07:10:18 +0000 Subject: import thermostat1-2.0-70.9.el7 --- diff --git a/SPECS/thermostat1.spec b/SPECS/thermostat1.spec index d8c89a3..12a7f63 100644 --- a/SPECS/thermostat1.spec +++ b/SPECS/thermostat1.spec @@ -8,12 +8,12 @@ %global debug_package %{nil} Name: %scl_name -Version: 1.2 +Version: 2.0 # 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.6%{?dist} +Release: 70.9%{?dist} Summary: Package that installs %scl License: GPLv2+ @@ -24,8 +24,10 @@ Source1: LICENSE BuildRequires: scl-utils-build >= 20130529-4 # Required for java macro expansion and a version # which has the fix for RHBZ#1098523 and RHBZ#1122947 -BuildRequires: javapackages-tools >= 3.4.1-6 -BuildRequires: javapackages-tools +BuildRequires: rh-java-common-javapackages-tools +BuildRequires: rh-mongodb26-scldevel +BuildRequires: rh-java-common-scldevel +BuildRequires: maven30-scldevel BuildRequires: help2man # This needs to require all packages shipped with the thermostat1 @@ -34,8 +36,8 @@ BuildRequires: help2man # as mongo-java-driver and mongodb from the mongodb collection. # See RHBZ#1033653 for an explanation as to why thermostat-webapp # and not thermostat without webapp. -Requires: %{scl_prefix}thermostat-webapp -Requires: %{name}-runtime +Requires: %{name}-thermostat-webapp +Requires: %{name}-runtime >= %{version}-%{release} %description This is the main package for the %scl Software Collection. @@ -43,7 +45,11 @@ This is the main package for the %scl Software Collection. %package runtime Summary: Package that handles %scl Software Collection. Requires: scl-utils >= 20130529-2 -Requires: mongodb24 >= 1-2 +# Thermostat depends on the mongodb collection +%{?scl_mongodb:Requires: %{scl_mongodb}} +# Starting with RHSCL 2.0 thermostat1 depends on the java common SCL +# for shared dependencies +Requires: %{?scl_prefix_java_common}runtime # The following packages are carried in the RHEL-6 based collection, # but come from base RHEL-7 there. Obsolete them appropriately @@ -109,29 +115,30 @@ Obsoletes: %{scl_prefix}mvn(asm:asm-commons) Obsoletes: %{name}-common < %{version}-%{release} %description runtime -Package shipping essential scripts to work with the %scl Software Collection. +Package shipping essential scripts to work with the %{scl} Software Collection. %package build Requires: scl-utils >= 20130529-2 -Requires: %{name}-runtime = %{version}-%{release} -# This version of javapackages-tools has the fix for -# RHBZ#1098523 and RHBZ#1122947 -Requires: javapackages-tools >= 3.4.1-6 -Summary: Build support tools for the %scl Software Collection. +Requires: %{name}-scldevel = %{version}-%{release} +Summary: Build support tools for the %{scl} Software Collection. %description build Package shipping essential configuration marcros/files in order to be able -to build %scl Software Collection. +to build %{scl} Software Collection. %package scldevel -Summary: Package shipping development files for %scl. +Summary: Package shipping development files for %{scl}. Group: Applications/File # This version of javapackages-tools has the fix for # RHBZ#1098523 and RHBZ#1122947 -Requires: javapackages-tools >= 3.4.1-6 +Requires: %{?scl_prefix_java_common}javapackages-tools +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{?scl_prefix_java_common}scldevel +Requires: %{?scl_prefix_mongodb}scldevel +Requires: %{?scl_prefix_maven}scldevel %description scldevel -Development files for %scl (useful e.g. for hierarchical collection +Development files for %{scl} (useful e.g. for hierarchical collection building with transitive dependencies). %prep @@ -140,10 +147,11 @@ building with transitive dependencies). # SCL enable script # #===================# cat <enable -# The thermostat1 collection depends on the mongodb24 collection -# for the mongo-java-driver. We need to source the enable script +# The thermostat1 collection depends on the mongodb collection +# for the mongo-java-driver and on the rh-java-commmon collection +# for shared dependencies. We need to source the enable script # in order for xmvn builds to work. -. scl_source enable mongodb24 +. scl_source enable %{?scl_mongodb} %{?scl_java_common} # Generic variables export PATH="%{_bindir}:\${PATH:-/bin:/usr/bin}" @@ -177,16 +185,19 @@ cat <configuration.xml + + /opt/rh/%{scl}/root/usr/share/maven-metadata + /opt/rh/%{scl}/root - opt/rh/%{scl}/root/usr/share/maven-fragments + opt/rh/%{scl}/root/usr/share/maven-metadata - %{scl}-resolve + resolve-%{scl} compound opt/rh/%{scl}/root @@ -194,24 +205,27 @@ cat <configuration.xml - - mongodb24-resolve base-resolve - resolve-system + resolve compound - - / - - %{scl}-resolve - mongodb24-resolve - base-resolve + + resolve-local + resolve-%{scl} + resolve-java-common + resolve-%{scl_mongodb} + resolve-%{scl_maven} @@ -228,37 +242,40 @@ cat <configuration.xml - - install-raw-pom - compound - - opt/rh/%{scl}/root - %{scl} - - - - base-raw-pom - - - - - install-effective-pom - compound - - opt/rh/%{scl}/root - %{scl} - - - - base-effective-pom - - - EOF #=====================# +# Javapackages config # +#=====================# +cat <javapackages-config.json +{ + "maven.req": { + "always_generate": [ + "%{scl}-runtime" + ], + "java_requires": { + "package_name": "java", + "always_generate": true, + "skip": false + }, + "java_devel_requires": { + "package_name": "java-devel", + "always_generate": false, + "skip": false + } + }, + "javadoc.req": { + "always_generate": [ + "%{scl}-runtime" + ] + } +} +EOF + + +#=====================# # README and man page # #=====================# # This section generates README file from a template and creates man page @@ -298,10 +315,12 @@ install -p -m 755 enable %{buildroot}%{_scl_scripts}/ install -d -m 755 %{buildroot}%{_sysconfdir}/java install -p -m 644 java.conf %{buildroot}%{_sysconfdir}/java/ +install -p -m 644 javapackages-config.json %{buildroot}%{_sysconfdir}/java/ install -d -m 755 %{buildroot}%{_sysconfdir}/xdg/xmvn install -p -m 644 configuration.xml %{buildroot}%{_sysconfdir}/xdg/xmvn/ + # Create java/maven/icons directories so that they'll get properly owned. # These are listed in the scl_files macro. See also: RHBZ#1057169 mkdir -p %{buildroot}%{_javadir} @@ -333,6 +352,7 @@ install -p -m 644 macros.%{scl_name_base}-scldevel %{buildroot}%{_root_sysconfdi %{scl_files} %dir %{_sysconfdir}/java %{_sysconfdir}/java/java.conf +%{_sysconfdir}/java/javapackages-config.json %{_sysconfdir}/xdg/xmvn/configuration.xml %dir %{_javadir} %dir %{_javadocdir} @@ -348,6 +368,36 @@ install -p -m 644 macros.%{scl_name_base}-scldevel %{buildroot}%{_root_sysconfdi %changelog +* Wed Jan 28 2015 Omair Majid - 2.0-70.9 +- Require mongodb26 scl. + +* Mon Jan 19 2015 Severin Gehwolf - 2.0-70.8 +- Switch to mongodb 2.6. + +* Thu Jan 15 2015 Severin Gehwolf - 2.0-70.7 +- Really disable mongodb dep. + +* Wed Jan 14 2015 Severin Gehwolf - 2.0-70.6 +- Temporarily disable mongodb26 runtime dependency. + +* Tue Jan 13 2015 Severin Gehwolf - 2.0-70.5 +- Switch to java-common's javapackages-tools. + +* Fri Jan 9 2015 Mikolaj Izdebski - 2.0-70.4 +- Fix XMvn configuration + +* Fri Jan 9 2015 Mikolaj Izdebski - 2.0-70.3 +- Fix invalid XML + +* Fri Jan 9 2015 Mikolaj Izdebski - 2.0-70.2 +- Adjust XMvn and javapackages configuration + +* Wed Dec 17 2014 Severin Gehwolf - 2.0-70.1 +- Start RHSCL 2.0 development. +- Don't use hard-coded collection names other than in BR. +- Enable resolving from java common collection. +- Also use maven30 collection rather than base maven. + * Tue Sep 16 2014 Severin Gehwolf - 1.2-70.6 - Add sub-packages to list of obsoletes which are only carried in the RHEL-6-based collection.