From 6a0f08e5e438083f58bb5a05f020b070e1d51098 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 12 2017 12:47:46 +0000 Subject: import rh-mongodb32-2.2-9.el7 --- diff --git a/SPECS/rh-mongodb32.spec b/SPECS/rh-mongodb32.spec index ffaf122..fd69841 100644 --- a/SPECS/rh-mongodb32.spec +++ b/SPECS/rh-mongodb32.spec @@ -25,7 +25,7 @@ Summary: Package that installs %{scl} Name: %{scl} Version: 2.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/File # template of man page with RPM macros to be expanded @@ -52,10 +52,6 @@ Summary: Package that handles %{scl} Software Collection. Group: Applications/File Requires: scl-utils Requires: /usr/bin/scl_source -# 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 @@ -230,7 +226,8 @@ sed -i "s|'|\\\\N'39'|g" %{?scl_name}.7 # create enable scriptlet that sets correct environment for collection cat << EOF | tee -a %{buildroot}%{?_scl_scripts}/enable -. scl_source enable %{scl_java_common} +[ -f %{_scl_prefix}/%{scl_java_common}/enable ] && . scl_source enable %{scl_java_common} + # For binaries export PATH="%{_bindir}\${PATH:+:\${PATH}}" # For header files @@ -347,6 +344,10 @@ restorecon -R %{_localstatedir} >/dev/null 2>&1 || : %{_root_sysconfdir}/rpm/macros.%{scl_name_base}-scldevel %changelog +* Tue Nov 21 2017 Marek Skalický - 2.2-9 +- Enable java-common SCL only if installed + Resolves: RHBZ#1523037 + * Thu Apr 21 2016 Marek Skalicky - 2.2-8 - Fixed syntax in man page Resolves: #1219517