rpms/scala/F-11 .cvsignore, 1.6, 1.7 scala.in, 1.1, 1.2 scala.spec, 1.7, 1.8 scalac.in, 1.1, 1.2 sources, 1.6, 1.7

[Geoffrey Reedy]

Author: geoff

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

Modified Files:
	.cvsignore scala.in scala.spec scalac.in sources 
Log Message:
* Tue May 12 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-1
- update to 2.7.4 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jan 2009 18:50:49 -0000	1.6
+++ .cvsignore	17 May 2009 04:06:14 -0000	1.7
@@ -1,3 +1,3 @@
-fjbg-r15432.tar.bz2
-scala-2.7.3.final-sources.tgz
-msil-2.7.3.final.tar.bz2
+fjbg-r17392.tar.bz2
+scala-2.7.4.final-sources.tgz
+msil-2.7.4.final.tar.bz2


Index: scala.in
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-11/scala.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scala.in	11 Oct 2008 14:15:24 -0000	1.1
+++ scala.in	17 May 2009 04:06:14 -0000	1.2
@@ -32,7 +32,7 @@ if [ -z "$EXTENSION_CLASSPATH" ] ; then
 fi
 EXTENSION_CLASSPATH="$EXTENSION_CLASSPATH:`build-classpath jline`"
 
-BOOT_CLASSPATH="`build-classpath scala/scala-library`"
+BOOT_CLASSPATH="`build-classpath scala/scala-library jline`"
 
 if [ $? != 0 ]; then
   echo $"Could not find the scala library jar." >&2


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-11/scala.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- scala.spec	25 Feb 2009 22:47:58 -0000	1.7
+++ scala.spec	17 May 2009 04:06:14 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           scala
-Version:        2.7.3
+Version:        2.7.4
 %define fullversion %{version}.final
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
 BuildArch:      noarch
 Group:          Development/Languages
@@ -15,15 +15,15 @@ Source0:        http://www.scala-lang.or
 
 %define msilversion %{fullversion}
 # Exported from upstream vcs
-#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_3_final msil-2.7.3.final
-#   tar cjf msil-2.7.3.final.tar.bz2 msil-2.7.3.final
+#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_4_final msil-2.7.4.final
+#   tar cjf msil-2.7.4.final.tar.bz2 msil-2.7.4.final
 Source1:      msil-%{msilversion}.tar.bz2
 
-%define fjbgversion r15432
+%define fjbgversion r17392
 # Exported from upstream vcs
-# No tag for 2.7.2
-#   svn export -r 15432 http://lampsvn.epfl.ch/svn-repos/scala/fjbg/trunk fjbg-r15432
-#   tar cjf fjbg-r15432.tar.bz2 fjbg-r15432
+# No tag for 2.7.4
+#   svn export -r 17392 http://lampsvn.epfl.ch/svn-repos/scala/fjbg/trunk fjbg-r17392
+#   tar cjf fjbg-r17392.tar.bz2 fjbg-r17392
 Source2:        fjbg-%{fjbgversion}.tar.bz2
 
 # Scripts
@@ -202,8 +202,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/scala
 %{_datadir}/scala/lib
 %{_mandir}/man1/*
-%doc dists/scala-%{fullversion}/doc/scala-devel-docs/LICENSE
-%doc dists/scala-%{fullversion}/doc/scala-devel-docs/README
+%doc dists/scala-%{fullversion}/doc/LICENSE
+%doc dists/scala-%{fullversion}/doc/README
 %{_datadir}/mime-info/*
 %{_datadir}/mime/packages/*
 
@@ -216,13 +216,16 @@ rm -rf $RPM_BUILD_ROOT
 %files apidoc
 %defattr(-,root,root,-)
 %doc dists/scala-%{fullversion}/doc/scala-devel-docs/api
-%doc dists/scala-%{fullversion}/doc/scala-devel-docs/LICENSE
+%doc dists/scala-%{fullversion}/doc/LICENSE
 
 %files examples
 %defattr(-,root,root,-)
 %{_datadir}/scala/examples
 
 %changelog
+* 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
 


Index: scalac.in
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-11/scalac.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scalac.in	11 Oct 2008 14:15:24 -0000	1.1
+++ scalac.in	17 May 2009 04:06:14 -0000	1.2
@@ -31,7 +31,7 @@ if [ -z "$EXTENSION_CLASSPATH" ] ; then
     done
 fi
 
-BOOT_CLASSPATH="`build-classpath scala/scala-library`"
+BOOT_CLASSPATH="`build-classpath scala/scala-library jline`"
 
 if [ $? != 0 ]; then
   echo $"Could not find the scala library jar." >&2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jan 2009 18:50:49 -0000	1.6
+++ sources	17 May 2009 04:06:14 -0000	1.7
@@ -1,3 +1,3 @@
-b1161674aa074b85f40e8bf26fd14bbc  fjbg-r15432.tar.bz2
-dd71f96782f6e461e97df6bce7e469d2  scala-2.7.3.final-sources.tgz
-cac89cd459f9428d76406f75294f8172  msil-2.7.3.final.tar.bz2
+ddf94b7fa410753bd3236c4184804b37  fjbg-r17392.tar.bz2
+8b79c304517cf378b4ca230366e31ea5  scala-2.7.4.final-sources.tgz
+1524e07ecdcc79b1a73ae8b9d5412cd4  msil-2.7.4.final.tar.bz2