Hello community, here is the log from the commit of package java-1_4_2-gcj-compat checked in at Thu Apr 20 17:47:23 CEST 2006. -------- --- java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes 2006-04-19 16:30:01.000000000 +0200 +++ STABLE/java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes 2006-04-20 16:45:15.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 20 16:43:10 CEST 2006 - jsmeix@suse.de + +- Add Debian wrapper scripts for javac and javah and use their + wrapper for javac by default (see Suse Bugzilla bug #163746). + +------------------------------------------------------------------- New: ---- gcj-wrapper-4.1 gcjh-wrapper-4.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_4_2-gcj-compat.spec ++++++ --- /var/tmp/diff_new_pack.5Tj6xd/_old 2006-04-20 17:46:47.000000000 +0200 +++ /var/tmp/diff_new_pack.5Tj6xd/_new 2006-04-20 17:46:47.000000000 +0200 @@ -13,7 +13,7 @@ Name: java-1_4_2-gcj-compat BuildRequires: gcc-java java2-devel-packages xerces-j2 xml-commons-apis Version: 1.4.2.0 -Release: 27 +Release: 29 %define section free %define gccsuffix %{nil} %define origin gcj%{gccsuffix} @@ -35,6 +35,10 @@ License: GPL URL: ftp://sources.redhat.com/pub/rhug/java-gcj-compat Source0: java-gcj-compat-%{jgcver}.tar.gz +# Debian gcj wrapper perl script: +Source10: gcj-wrapper-4.1 +# Debian gcjh wrapper perl script: +Source11: gcjh-wrapper-4.1 # Call gij instead of gcj in the "java" wrapper script: Patch0: java.in.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -144,6 +148,15 @@ ln -s %{sdkdir} %{jrelnk} ln -s %{sdkdir} %{sdklnk} popd +# install the Debian wrapper scripts: +install -m755 %{SOURCE10} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/ +install -m755 %{SOURCE11} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/ +# save the original javac (which is made for the ecj compiler from eclipse) +# and set a link to the Debian wrapper script (see Suse Bugzilla bug #163746): +pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/ + mv javac javac.eclipse + ln -s gcj-wrapper-4.1 javac +popd # generate file lists find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \ | sed 's|'$RPM_BUILD_ROOT'|%dir |' > %{name}-%{version}-all.files @@ -287,6 +300,7 @@ %defattr(-,root,root) %doc %dir %{_jvmdir}/%{sdkdir}/bin +%{_jvmdir}/%{sdkdir}/bin/javac %{_jvmdir}/%{sdkdir}/lib %{_jvmdir}/%{sdkdir}/include %{_jvmdir}/%{sdklnk} @@ -294,6 +308,9 @@ #%ghost %{_jvmdir}/%{cname}-%{version}/include/jni.h %changelog -n java-1_4_2-gcj-compat +* Thu Apr 20 2006 - jsmeix@suse.de +- Add Debian wrapper scripts for javac and javah and use their + wrapper for javac by default (see Suse Bugzilla bug #163746). * Wed Apr 19 2006 - jsmeix@suse.de - Do 'rm -rf %%{jvmjardir}/*' only when the package is removed (see Suse Bugzilla bug #148502). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...