rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.97, 1.98

[fedora-cvs-commits redhat com]

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1301

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Tue Aug 30 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_44rh
- Install ecj when building a custom java-1.4.2-gcj-compat.
- Fix removal of jaxp_parser_impl.jar alternative.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- java-1.4.2-gcj-compat.spec	29 Aug 2005 18:16:17 -0000	1.97
+++ java-1.4.2-gcj-compat.spec	30 Aug 2005 15:55:38 -0000	1.98
@@ -6,6 +6,7 @@
 %define bootstrap	1
 %endif
 
+# custom and bootstrap are incompatible; enable only one or the other.
 %{!?custom:	%define custom 0}
 %{!?gcjprefix: 	%define gcjprefix %{nil}}
 %{!?origin:	%{expand: %%define origin gcj%{gccsuffix}}}
@@ -137,6 +138,12 @@
 #   test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
 # popd
 
+%if %{custom}
+cp -a %{SOURCE2} eclipse-ecj-%{cname}.jar
+sed 's:@JAVADIR@:%{_javadir}:g;s:eclipse-ecj.jar:eclipse-ecj-%{cname}.jar:g' \
+  < %{SOURCE3} > ecj-%{cname}
+%endif
+
 %if %{bootstrap}
 mkdir tmp
 cp -a %{SOURCE2} eclipse-ecj.jar
@@ -155,6 +162,10 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+%if %{custom}
+ln -sf %{_bindir}/ecj-%{cname} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javac
+%endif
+
 # create extensions symlinks
 # jessie
 ln -s %{_javadir}/jsse.jar $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/jsse.jar
@@ -211,6 +222,13 @@
 # classmap database directory
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/gcj
 
+%if %{custom}
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+install -m644 eclipse-ecj-%{cname}.jar $RPM_BUILD_ROOT%{_javadir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m755 ecj-%{cname} $RPM_BUILD_ROOT%{_bindir}
+%endif
+
 %if %{bootstrap}
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 install -m644 eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}
@@ -336,7 +354,8 @@
    update-alternatives --remove java %{jrebindir}/java
    update-alternatives --remove jre_%{origin}  %{_jvmdir}/%{jrelnk}
    update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
-   update-alternatives --remove jaxp_parser_impl %{_javadir}/jaxp_parser_impl.jar
+   update-alternatives --remove jaxp_parser_impl \
+     %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar
 fi
 
 %{_bindir}/rebuild-security-providers
@@ -429,6 +448,10 @@
 %{_jvmdir}/%{sdkdir}/include
 %{_jvmdir}/%{sdklnk}
 %{_jvmjardir}/%{sdklnk}
+%if %{custom}
+%{_bindir}/ecj-%{cname}
+%{_javadir}/eclipse-ecj-%{cname}.jar
+%endif
 %if %{bootstrap}
 %{_bindir}/ecj
 %ifnarch ia64
@@ -441,6 +464,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Aug 30 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_44rh
+- Install ecj when building a custom java-1.4.2-gcj-compat.
+- Fix removal of jaxp_parser_impl.jar alternative.
+
 * Mon Aug 29 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_44rh
 - Import java-gcj-compat 1.0.37.
 - Remove aot-compile and find-and-aot-compile.