diff --git a/SPECS/thermostat1.spec b/SPECS/thermostat1.spec index fb66d80..d8c89a3 100644 --- a/SPECS/thermostat1.spec +++ b/SPECS/thermostat1.spec @@ -8,17 +8,23 @@ %global debug_package %{nil} Name: %scl_name -Version: 1.1 -Release: 5%{?dist} +Version: 1.2 +# 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} Summary: Package that installs %scl License: GPLv2+ -#URL: Source0: README Source1: LICENSE # Require minimal scl-utils which has fix for RHBZ#1033674 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: help2man @@ -34,28 +40,83 @@ Requires: %{name}-runtime %description This is the main package for the %scl Software Collection. -%package common -# xmvn config is set up so as to check collections in order: -# thermostat1 -> mongodb24 -> base -# Since thermostat1 packages can do ". /opt/rh/mongodb24/enable" -# make sure this file is there by requiring the owning package. -Requires: mongodb24 >= 1-2 -Summary: Package containing common parts of %{scl}-runtime and %{scl}-build sub packages. - -%description common -%{summary} - %package runtime Summary: Package that handles %scl Software Collection. Requires: scl-utils >= 20130529-2 -Requires: %{name}-common = %{version}-%{release} +Requires: mongodb24 >= 1-2 + +# The following packages are carried in the RHEL-6 based collection, +# but come from base RHEL-7 there. Obsolete them appropriately +# including sub-packages and mvn()-style provides. +Obsoletes: %{scl_prefix}apache-commons-beanutils +Obsoletes: %{scl_prefix}mvn(commons-beanutils:commons-beanutils) +Obsoletes: %{scl_prefix}apache-commons-beanutils-javadoc + +Obsoletes: %{scl_prefix}apache-commons-cli +Obsoletes: %{scl_prefix}mvn(commons-cli:commons-cli) +Obsoletes: %{scl_prefix}apache-commons-cli-javadoc + +Obsoletes: %{scl_prefix}apache-commons-codec +Obsoletes: %{scl_prefix}mvn(commons-codec:commons-codec) +Obsoletes: %{scl_prefix}apache-commons-codec-javadoc + +Obsoletes: %{scl_prefix}apache-commons-collections +Obsoletes: %{scl_prefix}mvn(commons-collections:commons-collections) +Obsoletes: %{scl_prefix}apache-commons-collections-javadoc +Obsoletes: %{scl_prefix}apache-commons-collections-testframework +Obsoletes: %{scl_prefix}apache-commons-collections-testframework-javadoc + +Obsoletes: %{scl_prefix}apache-commons-io +Obsoletes: %{scl_prefix}mvn(commons-io:commons-io) +Obsoletes: %{scl_prefix}apache-commons-io-javadoc + +Obsoletes: %{scl_prefix}apache-commons-logging +Obsoletes: %{scl_prefix}mvn(commons-logging:commons-logging) +Obsoletes: %{scl_prefix}apache-commons-logging-javadoc + +Obsoletes: %{scl_prefix}felix-framework +Obsoletes: %{scl_prefix}mvn(org.apache.felix:org.apache.felix.framework) +Obsoletes: %{scl_prefix}felix-framework-javadoc + +Obsoletes: %{scl_prefix}hawtjni +Obsoletes: %{scl_prefix}mvn(org.fusesource.hawtjni:hawtjni-runtime) +Obsoletes: %{scl_prefix}hawtjni-javadoc +Obsoletes: %{scl_prefix}maven-hawtjni-plugin + +Obsoletes: %{scl_prefix}httpcomponents-client +Obsoletes: %{scl_prefix}mvn(org.apache.httpcomponents:httpclient) +Obsoletes: %{scl_prefix}mvn(org.apache.httpcomponents:httpmime) +Obsoletes: %{scl_prefix}httpcomponents-client-javadoc + +Obsoletes: %{scl_prefix}httpcomponents-core +Obsoletes: %{scl_prefix}mvn(org.apache.httpcomponents:httpcore) +Obsoletes: %{scl_prefix}httpcomponents-core-javadoc + +Obsoletes: %{scl_prefix}jansi +Obsoletes: %{scl_prefix}mvn(org.fusesource.jansi:jansi) +Obsoletes: %{scl_prefix}jansi-javadoc + +Obsoletes: %{scl_prefix}jansi-native +Obsoletes: %{scl_prefix}mvn(org.fusesource.jansi:jansi-native) +Obsoletes: %{scl_prefix}jansi-native-javadoc + +Obsoletes: %{scl_prefix}objectweb-asm +Obsoletes: %{scl_prefix}objectweb-asm-javadoc +Obsoletes: %{scl_prefix}mvn(asm:asm) +Obsoletes: %{scl_prefix}mvn(asm:asm-commons) + +# In RHSCL 1.1 there was a -common sub package +Obsoletes: %{name}-common < %{version}-%{release} %description runtime Package shipping essential scripts to work with the %scl Software Collection. %package build Requires: scl-utils >= 20130529-2 -Requires: %{name}-common = %{version}-%{release} +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. %description build @@ -63,8 +124,11 @@ Package shipping essential configuration marcros/files in order to be able to build %scl Software Collection. %package scldevel -Summary: Package shipping development files for %scl. -Group: Applications/File +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 %description scldevel Development files for %scl (useful e.g. for hierarchical collection @@ -260,16 +324,11 @@ install -p -m 644 macros.%{scl_name_base}-scldevel %{buildroot}%{_root_sysconfdi # installed by installing %{name}. %files -# Runtime doesn't have files, they are owned by the shared subpackage. -# Why? Because we need enable and other config files in the build package -# as well. It would be bad for build to require runtime. -%files runtime -%doc README -%{_mandir}/man7/%{scl_name}.* - # The -f filesystem is RHEL-7 only. For some reason scl-utils does not # generate this file on RHEL-6. See RHBZ#1057169 and related bugs. -%files common -f filesystem +%files runtime -f filesystem +%doc README +%{_mandir}/man7/%{scl_name}.* %doc LICENSE %{scl_files} %dir %{_sysconfdir}/java @@ -289,6 +348,29 @@ install -p -m 644 macros.%{scl_name_base}-scldevel %{buildroot}%{_root_sysconfdi %changelog +* 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. +- Add scl-ized mvn() provides to list of obsoletes as well. +- Resolves: RHBZ#1088188 + +* Fri Jul 25 2014 Severin Gehwolf - 1.2-70.5 +- Fix javapackages-tools Rs/BRs. +- Related: RHBZ#1110882 + +* Wed Jun 25 2014 Severin Gehwolf - 1.2-70.4 +- Drop javapackages-tools requires from -scldevel. + +* Tue Jun 24 2014 Severin Gehwolf - 1.2-70.3 +- Obsolete el6-only carried transitive deps. +- Obsolete merged -common sub-package. + +* Tue Jun 24 2014 Severin Gehwolf - 1.2-70.2 +- Require minimal javapackages-tools version with xmvn bugfix. + +* Mon Jun 23 2014 Severin Gehwolf - 1.2-70.1 +- Merge common sub-package into runtime. + * Mon Mar 31 2014 Honza Horak - 1.1-5 - Fix path typo in README Related: #1061461