rpms/scala/devel scala-tooltemplate.patch, NONE, 1.1 scala.spec, 1.9, 1.10
Geoffrey Reedy
geoff at fedoraproject.org
Tue May 19 03:37:47 UTC 2009
Author: geoff
Update of /cvs/pkgs/rpms/scala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17126
Modified Files:
scala.spec
Added Files:
scala-tooltemplate.patch
Log Message:
* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-2
- fix launcher scripts by modifying template, not overriding them
scala-tooltemplate.patch:
--- NEW FILE scala-tooltemplate.patch ---
diff -ur ../scala-2.7.4.final-sources.orig/src/compiler/scala/tools/ant/templates/tool-unix.tmpl ./src/compiler/scala/tools/ant/templates/tool-unix.tmpl
--- ../scala-2.7.4.final-sources.orig/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2009-03-16 05:55:45.000000000 -0600
+++ ./src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2009-05-18 21:34:52.000000000 -0600
@@ -8,31 +8,14 @@
# PARTICULAR PURPOSE.
##############################################################################
-cygwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
-esac
-
-# Finding the root folder for this Scala distribution
-SOURCE=$0;
-SCRIPT=`basename "$SOURCE"`;
-while [ -h "$SOURCE" ]; do
- SCRIPT=`basename "$SOURCE"`;
- LOOKUP=`ls -ld "$SOURCE"`;
- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
- SOURCE=${TARGET:-.};
- else
- SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
- fi;
-done;
-SCALA_HOME=`dirname "$SOURCE"`/..;
-SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
-# Remove spaces from SCALA_HOME on windows
-if $cygwin; then
- SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"`
- SCALA_HOME=`cygpath --unix "$SCALA_HOME"`
-fi
+[ -r @@JAVADIR@@-utils/java-functions ] \
+ && . @@JAVADIR@@-utils/java-functions || exit 1
+
+set_javacmd || exit 3
+check_java_env || exit 4
+set_jvm_dirs || exit 5
+
+SCALA_HOME="@@DATADIR@@/scala"
# Constructing the extension classpath
TOOL_CLASSPATH="@classpath@"
@@ -46,21 +29,13 @@
done
fi
-if $cygwin; then
- if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
- format=mixed
- else
- format=windows
- 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
# Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris
[ -n "$JAVA_OPTS" ] || JAVA_OPTS="@javaflags@"
-if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
- JAVACMD="$JAVA_HOME/bin/java"
-fi
-
-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@"
+exec "${JAVACMD}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@"
Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/scala.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- scala.spec 17 May 2009 04:07:46 -0000 1.9
+++ scala.spec 19 May 2009 03:37:16 -0000 1.10
@@ -1,7 +1,7 @@
Name: scala
Version: 2.7.4
%define fullversion %{version}.final
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A hybrid functional/object-oriented language for the JVM
BuildArch: noarch
Group: Development/Languages
@@ -26,18 +26,13 @@ Source1: msil-%{msilversion}.tar.bz
# tar cjf fjbg-r17392.tar.bz2 fjbg-r17392
Source2: fjbg-%{fjbgversion}.tar.bz2
-# Scripts
-Source10: scala.in
-Source11: scalac.in
-Source12: scaladoc.in
-Source13: fsc.in
-
Source21: scala.keys
Source22: scala.mime
Source23: scala-mime-info.xml
Source24: scala.ant.d
Patch0: scala-buildfile.patch
+Patch1: scala-tooltemplate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,6 +96,7 @@ the Scala programming language
%prep
%setup -q -a 1 -a 2 -n scala-%{fullversion}-sources
%patch0 -b .build
+%patch1 -b .tooltemplate
# remove all jar files except scala-library and scala-compiler needed
# for bootstrap
find . -not \( -name 'scala-library.jar' -or -name 'scala-compiler.jar' \) -and -name '*.jar' | xargs rm -f
@@ -143,9 +139,6 @@ cp msil-%{msilversion}/lib/msil.jar lib/
# Rebuild scala with freshly compiled msil
%scala_ant clean fastdist || exit 1
-for script in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13}; do
- sed -e 's,@@JAVADIR@@,%{_javadir},g' -e 's,@@DATADIR@@,%{_datadir},g' $script > dists/scala-%{fullversion}/bin/`basename $script .in`
-done
%install
rm -rf $RPM_BUILD_ROOT
@@ -186,6 +179,8 @@ install -p -m 644 %{SOURCE21} %{SOURCE22
install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages/
install -p -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_datadir}/mime/packages/
+sed -i -e 's,@@JAVADIR@@,%{_javadir},g' -e 's,@@DATADIR@@,%{_datadir},g' $RPM_BUILD_ROOT%{_bindir}/*
+
%post
update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -223,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/scala/examples
%changelog
+* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-2
+- fix launcher scripts by modifying template, not overriding them
+
* Tue May 12 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-1
- update to 2.7.4 final
More information about the fedora-extras-commits
mailing list