- Re-add osgi.jar.so since gcj fix is in our gcc RPMs.
- Bump gcc requirements accordingly. - Add gcc-c++ to BuildRequires (for SWT Mozilla). - Add specific java-1.4.2-gcj-compat nvr requirement (rh#151866).
This commit is contained in:
Andrew Overholt
parent
79c2c329d4
commit
935fcc18ca
37
eclipse.spec
37
eclipse.spec
|
|
@ -23,7 +23,7 @@ ExclusiveArch: i386 x86_64 ppc
|
|||
Summary: %{pkg_summary}
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
|
||||
Release: 0.M6.10
|
||||
Release: 0.M6.11
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -95,12 +95,13 @@ BuildRequires: jpackage-utils >= 0:1.5, make, gcc
|
|||
BuildRequires: gnome-vfs2-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: mozilla >= 1.7.7
|
||||
BuildRequires: mozilla-devel >= 1.7.7
|
||||
BuildRequires: mozilla-nspr-devel >= 1.7.7
|
||||
BuildRequires: xorg-x11-devel
|
||||
%if %{gcj_support}
|
||||
BuildRequires: gcc-java >= 4.0.0-0.42
|
||||
BuildRequires: gcc-java >= 4.0.0-1
|
||||
BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_14rh
|
||||
%else
|
||||
BuildRequires: java-devel >= 1.4.2
|
||||
|
|
@ -129,8 +130,8 @@ Group: Development/Languages
|
|||
Obsoletes: ecj
|
||||
Provides: ecj
|
||||
%if %{gcj_support}
|
||||
Requires: libgcj >= 4.0.0-0.42
|
||||
Requires(post,postun): java-1.4.2-gcj-compat
|
||||
Requires: libgcj >= 4.0.0-1
|
||||
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
|
||||
%else
|
||||
Requires: java >= 1.4.2
|
||||
%endif
|
||||
|
|
@ -148,8 +149,8 @@ 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_14rh
|
||||
Requires: libgcj >= 4.0.0-0.42
|
||||
Requires(post,postun): java-1.4.2-gcj-compat
|
||||
Requires: libgcj >= 4.0.0-1
|
||||
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
|
||||
%else
|
||||
Requires: java >= 1.4.2
|
||||
%endif
|
||||
|
|
@ -184,8 +185,8 @@ 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-0.42
|
||||
Requires(post,postun): java-1.4.2-gcj-compat
|
||||
Requires: libgcj >= 4.0.0-1
|
||||
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
|
||||
%endif
|
||||
|
||||
%description jdt
|
||||
|
|
@ -205,8 +206,8 @@ Group: Text Editors/Integrated Development Environments (IDE)
|
|||
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
|
||||
Requires: libgcj >= 4.0.0-0.42
|
||||
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
|
||||
Requires: libgcj >= 4.0.0-1
|
||||
%endif
|
||||
|
||||
%package pde-devel
|
||||
|
|
@ -227,8 +228,8 @@ Eclipse PDE.
|
|||
Summary: SWT Library for GTK2
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
%if %{gcj_support}
|
||||
Requires(post,postun): java-1.4.2-gcj-compat
|
||||
Requires: libgcj >= 4.0.0-0.42
|
||||
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
|
||||
Requires: libgcj >= 4.0.0-1
|
||||
%endif
|
||||
|
||||
%description -n %{libname}-gtk2
|
||||
|
|
@ -518,10 +519,6 @@ ant \
|
|||
done
|
||||
%endif
|
||||
|
||||
# FIXME: temporarily remove org.eclipse.osgi_3.1.0.jar
|
||||
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=150513
|
||||
mv \
|
||||
.%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
|
||||
# FIXME: temporarily remove org.eclipse.ui.workbench_3.1.0.jar.so
|
||||
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
|
||||
mv \
|
||||
|
|
@ -989,7 +986,7 @@ fi
|
|||
%{_libdir}/%{name}/plugins/org.eclipse.update.core_3.1.0.jar.so
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.1.0.jar.so
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.1.0.jar.so
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so.bak
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0
|
||||
|
|
@ -1036,6 +1033,12 @@ fi
|
|||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
|
||||
|
||||
%changelog
|
||||
* Sun Apr 24 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M6.11
|
||||
- Re-add osgi.jar.so since gcj fix is in our gcc RPMs.
|
||||
- Bump gcc requirements accordingly.
|
||||
- Add gcc-c++ to BuildRequires (for SWT Mozilla).
|
||||
- Add specific java-1.4.2-gcj-compat nvr requirement (rh#151866).
|
||||
|
||||
* Fri Apr 22 2005 Aaron Luchko <aluchko@redhat.com> 3.1.0_fc-0.M6.10
|
||||
- Import archived projects (e.o#82988)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue