rpms/scala/F-10 scala-tooltemplate.patch, 1.1, 1.2 scala.spec, 1.8, 1.9

[Geoffrey Reedy]

Author: geoff

Update of /cvs/pkgs/rpms/scala/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21811

Modified Files:
	scala-tooltemplate.patch scala.spec 
Log Message:
* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-3
- fix problem with substitutions to scripts in %install


scala-tooltemplate.patch:

Index: scala-tooltemplate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-10/scala-tooltemplate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scala-tooltemplate.patch	18 May 2009 12:44:03 -0000	1.1
+++ scala-tooltemplate.patch	19 May 2009 03:58:40 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur scala-2.7.4.final-sources.orig/src/compiler/scala/tools/ant/templates/tool-unix.tmpl scala-2.7.4.final-sources/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
-+++ scala-2.7.4.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl	2009-05-18 01:08:53.000000000 -0600
+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.
  ##############################################################################
@@ -41,7 +41,7 @@ diff -ur scala-2.7.4.final-sources.orig/
  
  # Constructing the extension classpath
  TOOL_CLASSPATH="@classpath@"
-@@ -46,21 +29,7 @@
+@@ -46,21 +29,13 @@
      done
  fi
  
@@ -53,8 +53,12 @@ diff -ur scala-2.7.4.final-sources.orig/
 -    fi
 -    SCALA_HOME=`cygpath --$format "$SCALA_HOME"`
 -    TOOL_CLASSPATH=`cygpath --path --$format "$TOOL_CLASSPATH"`
--fi
--
++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@"
  


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-10/scala.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- scala.spec	18 May 2009 12:44:03 -0000	1.8
+++ scala.spec	19 May 2009 03:58:40 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           scala
 Version:        2.7.4
 %define fullversion %{version}.final
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
 BuildArch:      noarch
 Group:          Development/Languages
@@ -96,7 +96,7 @@ the Scala programming language
 %prep
 %setup -q -a 1 -a 2 -n scala-%{fullversion}-sources
 %patch0 -b .build
-%patch1 -p1 -b .tooltemplate
+%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
@@ -179,7 +179,7 @@ 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}/*
+sed -i -e 's, at JAVADIR@,%{_javadir},g' -e 's, at DATADIR@,%{_datadir},g' $RPM_BUILD_ROOT%{_bindir}/*
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -218,12 +218,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/scala/examples
 
 %changelog
+* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-3
+- fix problem with substitutions to scripts in %%install
+
 * 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
 
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jan 21 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.3-1
 - update to 2.7.3 final