From 28e03ea527961cded70b3d6e79987c402c155516 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 30 2019 12:00:02 +0000 Subject: import rh-ror50-5.0-8.el7 --- diff --git a/SPECS/rh-ror50.spec b/SPECS/rh-ror50.spec index cf6c5e3..8da9b40 100644 --- a/SPECS/rh-ror50.spec +++ b/SPECS/rh-ror50.spec @@ -11,8 +11,9 @@ # Fallback to rh-nodejs6 rh-nodejs6-scldevel is probably not available in # the buildroot. -%{!?scl_nodejs:%global scl_nodejs rh-nodejs6} -%{!?scl_prefix_nodejs:%global scl_prefix_nodejs %{scl_nodejs}-} +# rh-nodejs6 is no longer supported +#%%{!?scl_nodejs:%%global scl_nodejs rh-nodejs6} +#%%{!?scl_prefix_nodejs:%%global scl_prefix_nodejs %%{scl_nodejs}-} # Fallback to rh-mongodb32. rh-mongodb32-scldevel is probably not available in # the buildroot. @@ -33,7 +34,7 @@ Summary: Package that installs %scl Name: %scl_name Version: 5.0 -Release: 5%{?dist} +Release: 8%{?dist} License: GPLv2+ Source0: README Source1: LICENSE @@ -55,7 +56,8 @@ Requires: %{scl_prefix}rubygem-turbolinks Requires: %{scl_prefix}rubygem-uglifier Requires: %{scl_prefix}rubygem-web-console Requires: %{scl_prefix_ruby}rubygem-json -Requires: %{scl_prefix_nodejs}nodejs +# rh-nodejs6 is no longer supported +#Requires: %%{scl_prefix_nodejs}nodejs %endif BuildRequires: help2man BuildRequires: scl-utils-build @@ -79,7 +81,8 @@ Summary: Package shipping basic build configuration Requires: scl-utils-build Requires: %{scl_runtime} Requires: %{scl_prefix_ruby}scldevel -Requires: %{scl_prefix_nodejs}scldevel +# rh-nodejs6 is no longer supported +#Requires: %%{scl_prefix_nodejs}scldevel %description build Package shipping essential configuration macros to build %scl Software Collection. @@ -152,11 +155,15 @@ ruby -rfileutils > rubygems_filesystem.list << \EOR EOR EOF +# Create directory for license files (rhbz#1431083). +%{?_licensedir:mkdir -p %{buildroot}%{_licensedir}} + %files %files runtime -f rubygems_filesystem.list %doc README LICENSE %scl_files +%{?_licensedir:%dir %{_licensedir}} # Own the manual directories (rhbz#1080036, rhbz#1072319). %dir %{_mandir}/man1 %dir %{_mandir}/man5 @@ -170,6 +177,14 @@ EOF %{_root_sysconfdir}/rpm/macros.%{scl_name_base}-scldevel %changelog +* Thu Mar 07 2019 Pavel Valena - 5.0-8 +- Do not require rh-nodejs6 + Resolves: rhbz#1688946 + +* Fri Mar 10 2017 Jun Aruga - 5.0-6 +- Own the license directory. + Resolves: rhbz#1431083 + * Tue Jan 24 2017 Jun Aruga - 5.0-5 - Update scl_nodejs to rh-nodejs6.