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.166
diff -u -r1.166 java-1.4.2-gcj-compat.spec
--- java-1.4.2-gcj-compat.spec	14 Aug 2006 18:59:44 -0000	1.166
+++ java-1.4.2-gcj-compat.spec	23 Aug 2006 09:58:05 -0000
@@ -1,7 +1,8 @@
 %define section		free
 
-%{!?custom:	%define custom 0}
-%{!?gcjprefix: 	%define gcjprefix %{nil}}
+%define custom 1
+%define gcjprefix /opt/gcc
+%define gcj_prefix /opt/gcc
 %{!?origin:	%{expand: %%define origin gcj%{gccsuffix}}}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define gccsuffix	%{nil}
@@ -173,13 +174,13 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-%if %{custom}
-rm -f $RPM_BUILD_ROOT%{_bindir}/aot-compile-rpm
-rm -f $RPM_BUILD_ROOT%{_bindir}/rebuild-gcj-db
-rm -f $RPM_BUILD_ROOT%{_bindir}/aot-compile
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/aotcompile.py*
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/classfile.py*
-%endif
+#%if %{custom}
+#rm -f $RPM_BUILD_ROOT%{_bindir}/aot-compile-rpm
+#rm -f $RPM_BUILD_ROOT%{_bindir}/rebuild-gcj-db
+#rm -f $RPM_BUILD_ROOT%{_bindir}/aot-compile
+#rm -f $RPM_BUILD_ROOT%{python_sitelib}/aotcompile.py*
+#rm -f $RPM_BUILD_ROOT%{python_sitelib}/classfile.py*
+#%endif
 
 %if %{custom}
 ln -sf %{_bindir}/ecj-%{cname} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javac
@@ -597,9 +598,9 @@
 %doc
 %dir %{_jvmdir}/%{sdkdir}
 %dir %{jvmjardir}
-%if ! %{custom}
+#%if ! %{custom}
 %{_bindir}/rebuild-gcj-db
-%endif
+#%endif
 %{jvmjardir}/*.jar
 %{_jvmdir}/%{jrelnk}
 %{_jvmjardir}/%{jrelnk}
@@ -621,12 +622,12 @@
 %defattr(-,root,root)
 %doc
 %dir %{_jvmdir}/%{sdkdir}/bin
-%if ! %{custom}
+#%if ! %{custom}
 %{_bindir}/aot-compile
 %{_bindir}/aot-compile-rpm
 %{python_sitelib}/aotcompile.py*
 %{python_sitelib}/classfile.py*
-%endif
+#%endif
 %{_jvmdir}/%{sdkdir}/lib
 %{_jvmdir}/%{sdkdir}/include
 %{_jvmdir}/%{sdklnk}