From f5427d68bf867179703e528608e5d7dbc36878bd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2015 07:07:11 +0000
Subject: import devtoolset-3-3.1-12.el7


---

diff --git a/.devtoolset-3.metadata b/.devtoolset-3.metadata
index 428a27f..360ff3e 100644
--- a/.devtoolset-3.metadata
+++ b/.devtoolset-3.metadata
@@ -1 +1 @@
-7483812d597a7faae9ad2b48c0a8840d8502541e SOURCES/rhscl-dockerfiles-062c3b8.tar.gz
+c9e1c5b9d590d0caa6518cb833a5a15e9850b698 SOURCES/rhscl-dockerfiles-e90f5f9.tar.gz
diff --git a/.gitignore b/.gitignore
index 263c5c2..e224ff2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/rhscl-dockerfiles-062c3b8.tar.gz
+SOURCES/rhscl-dockerfiles-e90f5f9.tar.gz
diff --git a/SPECS/devtoolset-3.spec b/SPECS/devtoolset-3.spec
index 22cf516..7d2c5b8 100644
--- a/SPECS/devtoolset-3.spec
+++ b/SPECS/devtoolset-3.spec
@@ -1,13 +1,13 @@
 %global scl devtoolset-3
 %scl_package %scl
-%global dfcommit 062c3b833c8cc030204fdaf45d359dfafae63002
+%global dfcommit e90f5f98179410b7262098e4a016aa26dba598af
 %global dfshortcommit %(c=%{dfcommit}; echo ${c:0:7})
 %global dockerfiledir %{_datadir}/%{scl_prefix}dockerfiles
 
 Summary: Package that installs %scl
 Name: %scl_name
 Version: 3.1
-Release: 9%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: Applications/File
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,9 +20,6 @@ Obsoletes: %{name} < %{version}-%{release}
 BuildRequires: scl-utils-build >= 20120927-11
 BuildRequires: iso-codes
 
-# This is needed for java directory macros
-BuildRequires: javapackages-tools
-
 %description
 This is the main package for %scl Software Collection.
 
@@ -210,9 +207,9 @@ EOF
 # Java configuration
 # ==================
 cat <<EOF >java.conf
-JAVA_LIBDIR=%{_javadir}
-JNI_LIBDIR=%{_jnidir}
-JVM_ROOT=%{_jvmdir}
+JAVA_LIBDIR=%{_datadir}/java
+JNI_LIBDIR=%{_prefix}/lib/java
+JVM_ROOT=%{_prefix}/lib/jvm
 EOF
 
 # Ivy configuration
@@ -418,6 +415,15 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Thu May 07 2015 Marek Polacek <polacek@redhat.com> - 3.1-12
+- Update rhscl-dockerfiles from git (#1194663)
+
+* Wed May 06 2015 Mat Booth <mat.booth@redhat.com> - 3.1-11
+- Resolves: rhbz#1218605 - Avoid BR on javapackages-tools
+
+* Wed Apr 15 2015 Marek Polacek <polacek@redhat.com> - 3.1-10
+- Bump Release to mollify #1211655
+
 * Wed Apr 8 2015 Marek Polacek <polacek@redhat.com> - 3.1-9
 - Add Obsoletes (#1208867)