[scala/f17] Fix multiuser issues with fsc on /tmp/scala-devel directory (#903160)

[Jochen Schmitt]

commit 395f8da5ca634181818f9138d445676065b5a233
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Jan 23 17:08:32 2013 +0100

    Fix multiuser issues with fsc on /tmp/scala-devel directory (#903160)

 scala-2.9.2-tmpdir.patch |   12 ++++++++++++
 scala.spec               |   11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/scala-2.9.2-tmpdir.patch b/scala-2.9.2-tmpdir.patch
new file mode 100644
index 0000000..ee8fd02
--- /dev/null
+++ b/scala-2.9.2-tmpdir.patch
@@ -0,0 +1,12 @@
+diff -up scala-2.9.2-sources/src/compiler/scala/tools/nsc/CompileSocket.scala.fsc scala-2.9.2-sources/src/compiler/scala/tools/nsc/CompileSocket.scala
+--- scala-2.9.2-sources/src/compiler/scala/tools/nsc/CompileSocket.scala.fsc	2013-01-23 16:39:35.972198218 +0100
++++ scala-2.9.2-sources/src/compiler/scala/tools/nsc/CompileSocket.scala	2013-01-23 16:40:28.552572804 +0100
+@@ -72,7 +72,7 @@ class CompileSocket extends CompileOutpu
+   /** A temporary directory to use */
+   val tmpDir = {
+     val udir  = Option(Properties.userName) getOrElse "shared"
+-    val f     = (Path(Properties.tmpDir) / "scala-devel" / udir).createDirectory()
++    val f     = (Path(Properties.tmpDir) / ("scala-devel-" + udir)).createDirectory()
+ 
+     if (f.isDirectory && f.canWrite) {
+       info("[Temp directory: " + f + "]")
diff --git a/scala.spec b/scala.spec
index b54bfc0..6b6d244 100644
--- a/scala.spec
+++ b/scala.spec
@@ -8,7 +8,7 @@
 
 Name:           scala
 Version:        2.9.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
 BuildArch:      noarch
 Group:          Development/Languages
@@ -25,8 +25,10 @@ Patch1:		scala-2.9.2-tooltemplate.patch
 Patch2:	        scala-2.9.2-use_system_jline.patch
 # change org.scala-lang jline in org.sonatype.jline jline
 Patch3:	        scala-2.9.2-compiler-pom.patch
-
+# Patch to make swing compatible with jdk-1.7
 Patch4:	        scala-2.9.2-java7.patch
+# Create tmp directories as /tmp/scala-devel-$USER
+Patch5:	        scala-2.9.2-tmpdir.patch
 
 Source21:       scala.keys
 Source22:       scala.mime
@@ -94,6 +96,7 @@ the Scala programming language
 %patch2 -p1 -b .sysjline
 %patch3 -p0 -b .compiler-pom
 %patch4 -p1 -b .jdk7
+%patch5 -p1 -b .tmpdir
 
 pushd src
 rm -rf jline
@@ -187,6 +190,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_mandir}/man1/*
 %{_mavenpomdir}/JPP.%{name}-*.pom
 %{_mavendepmapfragdir}/%{name}
+
 %doc docs/LICENSE README
 
 %files -n ant-scala
@@ -204,6 +208,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc docs/LICENSE
 
 %changelog
+* Wed Jan 23 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.9.2-4
+- Fix multiuser issues with fsc on /tmp/scala-devel directory (#903160)
+
 * Sun Nov 25 2012 Jochen Schmitt <Jochen herr-schmitt de> 2.9.2-3
 - Fix OSGI dependency issue