rpms/java-1.5.0-gcj/devel java-1.5.0-gcj.spec,1.48,1.49

[Deepak Bhole]

Author: dbhole

Update of /cvs/pkgs/rpms/java-1.5.0-gcj/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12896

Modified Files:
	java-1.5.0-gcj.spec 
Log Message:

- Make javac a wrapper that sets PATH before calling ecj (rhbz# 460761)




Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- java-1.5.0-gcj.spec	4 May 2010 19:26:57 -0000	1.48
+++ java-1.5.0-gcj.spec	21 Jun 2010 17:08:45 -0000	1.49
@@ -55,7 +55,7 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 32%{?dist}
+Release: 33%{?dist}
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 # The LICENSE file has the classpath exception, but nothing in this package
@@ -436,6 +436,11 @@ pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir
   done
 popd
 
+# overwrite javac with our own version (rhbz# 460761)
+rm -f $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/bin/javac
+echo "export PATH=%{_jvmdir}/%{sdkdir}/bin:\${PATH}" > $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/bin/javac 
+echo "%{_bindir}/ecj \"\$@\"" >> $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/bin/javac
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -754,7 +759,7 @@ fi
 %{_jvmdir}/%{sdkdir}/bin/jar
 %{_jvmdir}/%{sdkdir}/bin/jarsigner
 %{_jvmdir}/%{sdkdir}/bin/java
-%{_jvmdir}/%{sdkdir}/bin/javac
+%attr(755, root, root) %{_jvmdir}/%{sdkdir}/bin/javac
 %{_jvmdir}/%{sdkdir}/bin/javadoc
 %{_jvmdir}/%{sdkdir}/bin/javah
 %{_jvmdir}/%{sdkdir}/bin/keytool
@@ -791,6 +796,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 08 2010 Deepak Bhole <dbhole at redhat.com> - 1.5.0.0-33
+- Make javac a wrapper that sets PATH before calling ecj (rhbz# 460761)
+
 * Tue May  4 2010 Michel Salim <salimma at fedoraproject.org> - 1.5.0.0-32
 - no longer require perl; Lua abs2rel script now in jpackage-utils