diff --git a/SOURCES/macros.rh-java-common b/SOURCES/macros.rh-java-common index 55582f2..da23199 100644 --- a/SOURCES/macros.rh-java-common +++ b/SOURCES/macros.rh-java-common @@ -4,6 +4,6 @@ # macro to invoke the javapackages provides and requires generators on el6 %java_common_find_provides_and_requires %{expand: \ %global _use_internal_dependency_generator 0 -%global __find_provides %{?scl:scl enable %{?scl} --} %{_rpmconfigdir}/rh-java-common-javapackages-provides-wrapper %{buildroot} --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} -%global __find_requires %{?scl:scl enable %{?scl} --} %{_rpmconfigdir}/rh-java-common-javapackages-requires-wrapper %{buildroot} --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} +%global __find_provides %{?scl:scl enable %{?scl_maven} %{?scl} --} %{_rpmconfigdir}/rh-java-common-javapackages-provides-wrapper %{buildroot} --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} +%global __find_requires %{?scl:scl enable %{?scl_maven} %{?scl} --} %{_rpmconfigdir}/rh-java-common-javapackages-requires-wrapper %{buildroot} --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} } diff --git a/SPECS/rh-java-common.spec b/SPECS/rh-java-common.spec index fcfba18..fc2d588 100644 --- a/SPECS/rh-java-common.spec +++ b/SPECS/rh-java-common.spec @@ -6,7 +6,7 @@ Name: %scl_name Version: 1.1 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Package that installs %scl License: GPLv2+ @@ -205,6 +205,10 @@ install -m 755 -d %{buildroot}%{_datadir}/xmvn %{_root_prefix}/lib/rpm/%{name}-javapackages-requires-wrapper %changelog +* Thu Jul 21 2016 Mikolaj Izdebski - 1.1-47 +- Try to always enable Maven SCL during auto-req/prov generation +- Resolves: rhbz#1358453 + * Fri Jan 29 2016 Michal Srb - 1.1-46 - Correctly handle XDG env. variables in enable script (Resolves: rhbz#1256340)