rpms/scala/F-10 scala-tooltemplate.patch, 1.2, 1.3 scala.spec, 1.9, 1.10
Geoffrey Reedy
geoff at fedoraproject.org
Tue May 19 12:46:20 UTC 2009
Author: geoff
Update of /cvs/pkgs/rpms/scala/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26718
Modified Files:
scala-tooltemplate.patch scala.spec
Log Message:
* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-5
- fix problem in tooltemplate patch
* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-4
- make jline implicitly available to match upstream behavior
scala-tooltemplate.patch:
Index: scala-tooltemplate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-10/scala-tooltemplate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- scala-tooltemplate.patch 19 May 2009 03:58:40 -0000 1.2
+++ scala-tooltemplate.patch 19 May 2009 12:45:49 -0000 1.3
@@ -41,7 +41,7 @@ diff -ur ../scala-2.7.4.final-sources.or
# Constructing the extension classpath
TOOL_CLASSPATH="@classpath@"
-@@ -46,21 +29,13 @@
+@@ -46,21 +29,8 @@
done
fi
@@ -53,11 +53,7 @@ diff -ur ../scala-2.7.4.final-sources.or
- fi
- SCALA_HOME=`cygpath --$format "$SCALA_HOME"`
- TOOL_CLASSPATH=`cygpath --path --$format "$TOOL_CLASSPATH"`
-+if [ -z "$TOOL_CLASSPATH" ] ; then
-+ TOOL_CLASSPATH="`find-jar jline`"
-+else
-+ TOOL_CLASSPATH="$TOOL_CLASSPATH:`find-jar jline`"
- fi
+-fi
# Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris
[ -n "$JAVA_OPTS" ] || JAVA_OPTS="@javaflags@"
Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-10/scala.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- scala.spec 19 May 2009 03:58:40 -0000 1.9
+++ scala.spec 19 May 2009 12:45:49 -0000 1.10
@@ -1,7 +1,7 @@
Name: scala
Version: 2.7.4
%define fullversion %{version}.final
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: A hybrid functional/object-oriented language for the JVM
BuildArch: noarch
Group: Development/Languages
@@ -167,6 +167,8 @@ for libname in library compiler dbc part
ln -s scala-$libname-%{fullversion}.jar $RPM_BUILD_ROOT%{_javadir}/scala/scala-$libname.jar
ln -s `relativepath %{_javadir}/scala/scala-$libname.jar %{scaladir}/lib` $RPM_BUILD_ROOT%{scaladir}/lib
done
+jline_jar=`find-jar jline`
+ln -s `relativepath $jline_jar %{scaladir}/lib` $RPM_BUILD_ROOT%{scaladir}/lib
install -d $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
install -p -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/scala
@@ -218,6 +220,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/scala/examples
%changelog
+* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-5
+- fix problem in tooltemplate patch
+
+* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-4
+- make jline implicitly available to match upstream behavior
+
* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-3
- fix problem with substitutions to scripts in %%install
More information about the scm-commits
mailing list