rpms/scala/F-9 scala-buildfile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 scala.spec, 1.1, 1.2 sources, 1.2, 1.3 scala-2.7.2.RC1.build.patch, 1.1, NONE

[Geoffrey Reedy]

Author: geoff

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

Modified Files:
	.cvsignore scala.spec sources 
Added Files:
	scala-buildfile.patch 
Removed Files:
	scala-2.7.2.RC1.build.patch 
Log Message:
* Thu Oct 30 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.1.RC5
- update to 2.7.2-RC5


scala-buildfile.patch:

--- NEW FILE scala-buildfile.patch ---
--- build.xml.orig	2008-10-30 22:35:50.000000000 -0600
+++ build.xml	2008-10-30 22:38:43.000000000 -0600
@@ -126,15 +126,7 @@
     <condition property="os.win">
       <os family="windows"/>
     </condition>
-  <!-- Finding out SVN revision -->
-    <exec executable="svn" outputproperty="svn.out"
-      failifexecutionfails="false">
-      <arg line=" info ${basedir}"/>
-    </exec>
-    <propertyregex
-      property="svn.number" input="${svn.out}" select="\1"
-      regexp="Revision: ([0-9]+)"
-      defaultValue="0"/>
+    <property name="svn.number" value="0"/>
     <property name="init.avail" value="yes"/>
   <!-- Generating version number -->
     <property file="${basedir}/build.number"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Oct 2008 22:43:38 -0000	1.2
+++ .cvsignore	1 Nov 2008 00:16:58 -0000	1.3
@@ -1,3 +1,3 @@
+scala-2.7.2.RC5-sources.tgz
+msil-2.7.2.RC5.tar.bz2
 fjbg-r15432.tar.bz2
-msil-2.7.2.RC1.tar.bz2
-scala-2.7.2.RC1-sources.tgz


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-9/scala.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scala.spec	12 Oct 2008 22:43:38 -0000	1.1
+++ scala.spec	1 Nov 2008 00:16:58 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           scala
 Version:        2.7.2
-%define fullversion %{version}.RC1
-Release:        0.2.RC1%{?dist}
+%define fullversion %{version}.RC5
+Release:        0.1.RC5%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
 BuildArch:      noarch
 Group:          Development/Languages
@@ -15,13 +15,13 @@
 
 %define msilversion %{fullversion}
 # Exported from upstream vcs
-#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_2_RC1 msil-2.7.2.RC1
-#   tar cjf msil-2.7.2.RC1.tar.bz2 msil-2.7.2.RC1
+#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_2_RC5 msil-2.7.2.RC5
+#   tar cjf msil-2.7.2.RC5.tar.bz2 msil-2.7.2.RC5
 Source1:      msil-%{msilversion}.tar.bz2
 
 %define fjbgversion r15432
 # Exported from upstream vcs
-# No tag for RC1
+# No tag for RC5
 #   svn export -r 15432 http://lampsvn.epfl.ch/svn-repos/scala/fjbg/trunk fjbg-r15432
 #   tar cjf fjbg-r15432.tar.bz2 fjbg-r15432
 Source2:        fjbg-%{fjbgversion}.tar.bz2
@@ -37,7 +37,7 @@
 Source23:       scala-mime-info.xml
 Source24:       scala.ant.d
 
-Patch0:         scala-2.7.2.RC1.build.patch
+Patch0:         scala-buildfile.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -99,15 +99,13 @@
 %define scaladir %{_datadir}/scala
 
 %prep
-%setup -q -c -a 1 -a 2 -n %{name}-%{fullversion}
-%patch0 -p1 -b .build
+%setup -q -a 1 -a 2 -n scala-%{fullversion}-sources
+%patch0 -b .build
 # 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
 find . -name '*.dll' -or -name '*.so' -or -name '*.exe' | xargs rm -f
 ln -s `find-jar ant-contrib` lib/ant/ant-contrib.jar
-mkdir META-INF && touch META-INF/MANIFEST.MF
-
 
 %build
 # Scala is written in itself and therefore requires boot-strapping from an
@@ -218,7 +216,6 @@
 %files apidoc
 %defattr(-,root,root,-)
 %doc dists/scala-%{fullversion}/doc/scala-devel-docs/api
-%doc dists/scala-%{fullversion}/doc/scala-devel-docs/swing
 %doc dists/scala-%{fullversion}/doc/scala-devel-docs/LICENSE
 
 %files examples
@@ -226,13 +223,16 @@
 %{_datadir}/scala/examples
 
 %changelog
-* Sat Sep 06 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.2.RC2
+* Thu Oct 30 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.1.RC5
+- update to 2.7.2-RC5
+
+* Sat Sep 06 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.2.RC1
 - All code is now under BSD license
 - Remove dll so and exe binaries in prep
 - Add BuildRequires required by Java packaging guidelines
 - Add missing defattr for examples and ant-scala
 
-* Wed Aug 20 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.1.RC2
+* Wed Aug 20 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.1.RC1
 - update to 2.7.2-RC1
 
 * Wed Aug 13 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.1-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Oct 2008 22:43:38 -0000	1.2
+++ sources	1 Nov 2008 00:16:58 -0000	1.3
@@ -1,3 +1,3 @@
+19c744e5af050de64b88758d71eae6d9  scala-2.7.2.RC5-sources.tgz
+a62157bcf7c30abd1ee0a4e7beedda51  msil-2.7.2.RC5.tar.bz2
 b1161674aa074b85f40e8bf26fd14bbc  fjbg-r15432.tar.bz2
-b5d8acab9c15f07d607eddce64ffe4d4  msil-2.7.2.RC1.tar.bz2
-1c3004f76d7ab1d7322087e774d39594  scala-2.7.2.RC1-sources.tgz


--- scala-2.7.2.RC1.build.patch DELETED ---