rpms/scala/devel scala.spec,1.10,1.11

[Geoffrey Reedy]

Author: geoff

Update of /cvs/pkgs/rpms/scala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19126

Modified Files:
	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



Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/scala.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- scala.spec	19 May 2009 03:37:16 -0000	1.10
+++ scala.spec	19 May 2009 03:45:42 -0000	1.11
@@ -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
@@ -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,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-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