rpms/eclipse/devel eclipse.spec,1.114,1.115
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 25 22:39:27 UTC 2005
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5138
Modified Files:
eclipse.spec
Log Message:
* Sun Apr 24 2005 Andrew Overholt <overholt at 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).
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- eclipse.spec 22 Apr 2005 18:43:13 -0000 1.114
+++ eclipse.spec 25 Apr 2005 22:39:24 -0000 1.115
@@ -23,7 +23,7 @@
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: 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 @@
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}-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 @@
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 @@
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 @@
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 @@
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 @@
%{_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 @@
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
+* Sun Apr 24 2005 Andrew Overholt <overholt at 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 at redhat.com> 3.1.0_fc-0.M6.10
- Import archived projects (e.o#82988)
More information about the fedora-cvs-commits
mailing list