From 3135af8f6ad44302c8c7c980ce4a73ffcdfe145e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 31 2016 08:13:37 +0000
Subject: import rh-java-common-1.1-46.el7


---

diff --git a/SPECS/rh-java-common.spec b/SPECS/rh-java-common.spec
index 0a2c4a1..fcfba18 100644
--- a/SPECS/rh-java-common.spec
+++ b/SPECS/rh-java-common.spec
@@ -6,7 +6,7 @@
 
 Name:       %scl_name
 Version:    1.1
-Release:    43%{?dist}
+Release:    46%{?dist}
 Summary:    Package that installs %scl
 
 License:    GPLv2+
@@ -41,11 +41,19 @@ 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, with support for maven30
+Requires:   %{name}-scldevel-common = %{version}-%{release}
+Requires:   %{?scl_prefix_maven}scldevel
+
+%description scldevel
+Package shipping development files, especially useful for development of
+packages depending on %scl and maven30 Software Collection.
+
+%package scldevel-common
 Summary:    Package shipping development files for %scl
 Requires:   %{name}-runtime = %{version}-%{release}
-Requires:   %{scl_prefix_maven}scldevel
 
-%description scldevel
+%description scldevel-common
 Package shipping development files, especially useful for development of
 packages depending on %scl Software Collection.
 
@@ -61,8 +69,8 @@ export MANPATH="%{_mandir}:\${MANPATH}"
 export PYTHONPATH="%{_scl_root}%{python_sitelib}\${PYTHONPATH:+:}\${PYTHONPATH:-}"
 
 export JAVACONFDIRS="%{_sysconfdir}/java\${JAVACONFDIRS:+:}\${JAVACONFDIRS:-}"
-export XDG_CONFIG_DIRS="%{_sysconfdir}/xdg\${XDG_CONFIG_DIRS:+:}\${XDG_CONFIG_DIRS:-}"
-export XDG_DATA_DIRS="%{_datadir}\${XDG_DATA_DIRS:+:}\${XDG_DATA_DIRS:-}"
+export XDG_CONFIG_DIRS="%{_sysconfdir}/xdg:\${XDG_CONFIG_DIRS:-/etc/xdg}"
+export XDG_DATA_DIRS="%{_datadir}:\${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
 EOF
 
 # Generate Eclipse configuration file
@@ -190,11 +198,22 @@ install -m 755 -d %{buildroot}%{_datadir}/xmvn
 %{_root_sysconfdir}/rpm/macros.%{scl}-config
 
 %files scldevel
+# intentionally empty
+%files scldevel-common
 %{_root_sysconfdir}/rpm/macros.%{scl_name_base}-scldevel
 %{_root_prefix}/lib/rpm/%{name}-javapackages-provides-wrapper
 %{_root_prefix}/lib/rpm/%{name}-javapackages-requires-wrapper
 
 %changelog
+* Fri Jan 29 2016 Michal Srb <msrb@redhat.com> - 1.1-46
+- Correctly handle XDG env. variables in enable script (Resolves: rhbz#1256340)
+
+* Fri Jan 29 2016 Michal Srb <msrb@redhat.com> - 1.1-45
+- Rebuild
+
+* Wed Jan 27 2016 Michal Srb <msrb@redhat.com> - 1.1-44
+- Move all macros and scripts from scldevel to scldevel-common (Resolves: rhbz#1302336)
+
 * Tue Jul 21 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-43
 - Fix syntax errors in manpage