diff --git a/SPECS/rh-mongodb26.spec b/SPECS/rh-mongodb26.spec index 00d9fe3..4bc3f3b 100644 --- a/SPECS/rh-mongodb26.spec +++ b/SPECS/rh-mongodb26.spec @@ -29,7 +29,7 @@ Summary: Package that installs %{scl} Name: %{scl} Version: 2.0 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ Group: Applications/File # template of man page with RPM macros to be expanded @@ -58,10 +58,6 @@ Group: Applications/File Requires: scl-utils Requires: /usr/bin/scl_source Requires: %{scl_v8_prefix}runtime -# Those two java common requires are for build-classpath et. al. -# to work. See RHBZ#1129287 -Requires: %{?scl_prefix_java_common}runtime -Requires: %{?scl_prefix_java_common}javapackages-tools Requires(post): policycoreutils-python, libselinux-utils %description runtime @@ -222,7 +218,8 @@ help2man -N --section 7 ./h2m_helper -o %{?scl_name}.7 # create enable scriptlet that sets correct environment for collection cat << EOF | tee -a %{buildroot}%{?_scl_scripts}/enable -. scl_source enable %{scl_v8} %{scl_java_common} +. scl_source enable %{scl_v8} +[ -f %{_scl_prefix}/%{scl_java_common}/enable ] && . scl_source enable %{scl_java_common} # For binaries export PATH="%{_bindir}\${PATH:+:\${PATH}}" # For header files @@ -329,6 +326,10 @@ restorecon -R %{_localstatedir} >/dev/null 2>&1 || : %{_root_sysconfdir}/rpm/macros.%{scl_name_base}-scldevel %changelog +* Tue Nov 21 2017 Marek Skalický - 2.0-20 +- Enable java-common SCL only if installed + Resolves: RHBZ#1523039 + * Thu Mar 19 2015 Marek Skalicky - 2.0-19 - Fixed java and maven directory ownership