rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Re-enable jdt.ui/jdt.jar.so and require gcj 4.0.0-2 (rh#151296).

This commit is contained in:
Ben Konrath 2005-05-05 01:58:58 +00:00
parent 518aafdf7c
commit f7ace1f432
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
eclipse.spec
View File

@ -23,7 +23,7 @@ ExclusiveArch: i386 x86_64 ppc
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
Release: 0.M6.14
Release: 0.M6.15
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -104,7 +104,7 @@ BuildRequires: mozilla-devel >= 37:1.7.7
BuildRequires: mozilla-nspr-devel >= 37:1.7.7
BuildRequires: xorg-x11-devel
%if %{gcj_support}
BuildRequires: gcc-java >= 4.0.0-1
BuildRequires: gcc-java >= 4.0.0-2
BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_18rh
%else
BuildRequires: java-devel >= 1.4.2
@ -133,7 +133,7 @@ Group: Development/Languages
Obsoletes: ecj
Provides: ecj
%if %{gcj_support}
Requires: libgcj >= 4.0.0-1
Requires: libgcj >= 4.0.0-2
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
%else
Requires: java >= 1.4.2
@ -152,7 +152,7 @@ Provides: %{name}-ui = %{epoch}:%{version}-%{release}
Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
Requires: libgcj >= 4.0.0-1
Requires: libgcj >= 4.0.0-2
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
%else
Requires: java >= 1.4.2
@ -188,7 +188,7 @@ Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-ecj = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires: libgcj >= 4.0.0-1
Requires: libgcj >= 4.0.0-2
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
%endif
@ -210,7 +210,7 @@ Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: %{name}-platform-devel = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
Requires: libgcj >= 4.0.0-1
Requires: libgcj >= 4.0.0-2
%endif
%package pde-devel
@ -232,7 +232,7 @@ Summary: SWT Library for GTK2
Group: Text Editors/Integrated Development Environments (IDE)
%if %{gcj_support}
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
Requires: libgcj >= 4.0.0-1
Requires: libgcj >= 4.0.0-2
%endif
%description -n %{libname}-gtk2
@ -529,10 +529,6 @@ ant \
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
mv \
.%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
# FIXME: temporarily remove org.eclipse.jdt.ui_3.1.0/jdt_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151296
mv \
.%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_%{eclipse_majmin}.%{eclipse_micro}/jdt.jar.so{,.bak}
pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
@ -1039,6 +1035,9 @@ fi
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
* Wed May 4 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.15
- Re-enable jdt.ui/jdt.jar.so and require gcj 4.0.0-2 (rh#151296).
* Mon May 2 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.14
- Replace temporary patch to debug.ui with upstream patch to swt (rh#155853).