- Add patch from Tom Tromey for ecj-gcj branch of gcj.

- Fix SWT symlinks.
This commit is contained in:
Andrew Overholt 2006-07-19 02:44:16 +00:00
parent 0b07fea6c2
commit 0e12cd7d68
2 changed files with 1194 additions and 2 deletions

1185
eclipse-ecj-gcj.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -41,7 +41,7 @@ Epoch: 1
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 1jpp_3fc
Release: 1jpp_4fc
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -123,6 +123,8 @@ Patch22: %{name}-updatehomedir.patch
# JPackage []s in names of symlinks ...
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
Patch34: %{name}-bz162177.patch
# Use ecj for gcj
Patch57: %{name}-ecj-gcj.patch
%if %{gcj_support}
%else
@ -419,6 +421,7 @@ pushd plugins/org.eclipse.compare
popd
pushd plugins/org.eclipse.jdt.core
%patch34 -p0
%patch57 -p0
popd
%patch38 -p0
%patch40 -p0
@ -905,7 +908,7 @@ for base in awt-gtk atk-gtk cairo-gtk mozilla-gtk gnome-gtk gtk pi-gtk glx-gtk;
done
popd
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
pushd $RPM_BUILD_ROOT%{_javadir}
ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$swtjarversion.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
@ -1631,6 +1634,10 @@ fi
%endif
%changelog
* Tue Jul 18 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_4fc
- Add patch from Tom Tromey for ecj-gcj branch of gcj.
- Fix SWT symlinks.
* Tue Jul 18 2006 Igor Foox <ifoox@redhat.com> 3.2.0-1jpp_3fc
- Rebuild.