diff --git a/eclipse.spec b/eclipse.spec index 58ef0f8..2571060 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -3,7 +3,7 @@ # The intersection of the IBM-supported platforms and # the platforms we want. -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: i386 x86_64 Epoch: 1 %define pkg_summary An open extensible IDE @@ -52,7 +52,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 13 +Release: 14 License: CPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -96,6 +96,7 @@ Patch24: %{name}-cvs-permission-bits2.patch Patch25: %{name}-search.patch Patch26: %{name}-textsearch.patch Patch27: %{name}-webappcpfix.patch +Patch28: %{name}-textbinarysearch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -169,6 +170,7 @@ Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-ui = %{epoch}:%{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release} Requires: gcc4-java >= 4.0.0-0.21 +Requires: java-1.4.2-gcj4-compat-devel >= 1.4.2.0-2jpp %description jdt Eclipse Java developments tools. @@ -194,6 +196,7 @@ Eclipse PDE. %package -n %{libname}-gtk2 Summary: SWT Library for GTK2 Group: Text Editors/Integrated Development Environments (IDE) +Requires: gcc4-java >= 4.0.0-0.21 %description -n %{libname}-gtk2 SWT Library for GTK2. @@ -234,6 +237,7 @@ pushd "plugins/org.eclipse.search" popd %patch26 -p0 %patch27 -p0 +%patch28 -p0 # Red Hat splash screen. @@ -800,8 +804,12 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/%{name}/%{name}-platform.jarswithnativelibs %changelog -* Fri Jan 28 2005 Andrew Overholt 1:3.0.1_fc-13 +* Fri Jan 28 2005 Andrew Overholt 1:3.0.1_fc-14 - add necessary gcj4 compilation option for ecj building +- add gcc4-java as a requirement of libswt3-gtk2 (for gcj-dbtool4) +- add java-1.4.2-gcj4-compat-devel as a requirement of jdt +- add new patch for TextEdit binary search (see e.o#84104#) +- remove ppc for now * Thu Jan 27 2005 Andrew Overholt 1:3.0.1_fc-12 - add ppc