rpms/eclipse/devel eclipse.spec,1.184,1.185
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 10 14:10:30 UTC 2005
- Previous message (by thread): rpms/kdeaccessibility/devel .cvsignore, 1.6, 1.7 kdeaccessibility.spec, 1.7, 1.8 sources, 1.6, 1.7
- Next message (by thread): rpms/rhpl/devel rhpl.spec,1.54,1.55 sources,1.51,1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13031
Modified Files:
eclipse.spec
Log Message:
* Sat Oct 08 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-15
- Bump mozilla requirement.
- Re-enable org.eclipse.ui.forms_3.1.0.jar.so, org.eclipse.osgi_3.1.0.jar.so,
and org.eclipse.ui.workbench_3.1.0.jar.so (rh#146463, rh#158137, rh#151919)
- Add patch for /etc/gre64.conf (for 64-bit systems, rh#168040, e.o#109253).
- Remove MOZILLA_FIVE_HOME magic from eclipse.script.
- Remove jdtCompilerAdapter.jar due to aot-compile-rpm smarts.
- Bump gcc and java-gcj-compat requirements.
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- eclipse.spec 8 Oct 2005 19:17:19 -0000 1.184
+++ eclipse.spec 10 Oct 2005 14:10:27 -0000 1.185
@@ -122,8 +122,8 @@
BuildRequires: xorg-x11-devel
%endif
%if %{gcj_support}
-BuildRequires: gcc-java >= 4.0.1
-BuildRequires: java-gcj-compat-devel >= 1.0.33
+BuildRequires: gcc-java >= 4.0.2
+BuildRequires: java-gcj-compat-devel >= 1.0.43
BuildRequires: dos2unix
%else
BuildRequires: java-devel >= 1.4.2
@@ -140,8 +140,8 @@
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
%if %{gcj_support}
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
+Requires(post): java-gcj-compat >= 1.0.43
+Requires(postun): java-gcj-compat >= 1.0.43
%endif
%description
@@ -156,9 +156,9 @@
Obsoletes: ecj
Provides: ecj
%if %{gcj_support}
-Requires: libgcj >= 4.0.1
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
+Requires: libgcj >= 4.0.2
+Requires(post): java-gcj-compat >= 1.0.43
+Requires(postun): java-gcj-compat >= 1.0.43
%else
Requires: java >= 1.4.2
%endif
@@ -176,10 +176,10 @@
Provides: %{name}-scripts = %{epoch}:%{version}-%{release}
Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release}
%if %{gcj_support}
-Requires: libgcj >= 4.0.1
-Requires: java-gcj-compat >= 1.0.33
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
+Requires: libgcj >= 4.0.2
+Requires: java-gcj-compat >= 1.0.43
+Requires(post): java-gcj-compat >= 1.0.43
+Requires(postun): java-gcj-compat >= 1.0.43
%else
Requires: java >= 1.4.2
%endif
@@ -219,9 +219,9 @@
Requires: %{name}-ecj = %{epoch}:%{version}-%{release}
Requires: junit >= 3.8.1-3jpp
%if %{gcj_support}
-Requires: libgcj >= 4.0.1
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
+Requires: libgcj >= 4.0.2
+Requires(post): java-gcj-compat >= 1.0.43
+Requires(postun): java-gcj-compat >= 1.0.43
%endif
%description jdt
@@ -241,9 +241,9 @@
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: %{name}-platform-devel = %{epoch}:%{version}-%{release}
%if %{gcj_support}
-Requires: libgcj >= 4.0.1
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
+Requires: libgcj >= 4.0.2
+Requires(post): java-gcj-compat >= 1.0.43
+Requires(postun): java-gcj-compat >= 1.0.43
%endif
%package pde-devel
@@ -264,9 +264,9 @@
Summary: SWT Library for GTK2
Group: Text Editors/Integrated Development Environments (IDE)
%if %{gcj_support}
-Requires: libgcj >= 4.0.1
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
+Requires: libgcj >= 4.0.2
+Requires(post): java-gcj-compat >= 1.0.43
+Requires(postun): java-gcj-compat >= 1.0.43
%endif
%description -n %{libname}-gtk2
@@ -276,9 +276,9 @@
Summary: Eclipse Rich Client Platform
Group: Development/Languages
%if %{gcj_support}
-Requires: libgcj >= 4.0.1
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
+Requires: libgcj >= 4.0.2
+Requires(post): java-gcj-compat >= 1.0.43
+Requires(postun): java-gcj-compat >= 1.0.43
%else
Requires: java >= 1.4.2
%endif
@@ -593,8 +593,6 @@
result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar
-unzip -d plugins plugins/org.eclipse.jdt.core_3.1.0.jar jdtCompilerAdapter.jar
# Extract .so files
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
@@ -847,8 +845,7 @@
# Build and install ecj binary
pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
- -Wl,-R,%{_libdir}/gcj/%{name} \
- org.eclipse.jdt.core_3.1.0.jar.so jdtCompilerAdapter.jar.so -o \
+ -Wl,-R,%{_libdir}/gcj/%{name} org.eclipse.jdt.core_3.1.0.jar.so \
$RPM_BUILD_ROOT%{_bindir}/ecj
popd
chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
@@ -915,15 +912,12 @@
%dir %{_datadir}/%{name}/features
%dir %{_datadir}/%{name}/configuration
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
-%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar
%{_datadir}/java/eclipse-ecj.jar
%if %{gcj_support}
# Native bits
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.so
-%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.db
%{_bindir}/ecj
%endif
@@ -1164,6 +1158,8 @@
and org.eclipse.ui.workbench_3.1.0.jar.so (rh#146463, rh#158137, rh#151919)
- Add patch for /etc/gre64.conf (for 64-bit systems, rh#168040, e.o#109253).
- Remove MOZILLA_FIVE_HOME magic from eclipse.script.
+- Remove jdtCompilerAdapter.jar due to aot-compile-rpm smarts.
+- Bump gcc and java-gcj-compat requirements.
* Wed Aug 24 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-14
- /usr/lib -> %{_libdir} in eclipse.script (rh#159031).
- Previous message (by thread): rpms/kdeaccessibility/devel .cvsignore, 1.6, 1.7 kdeaccessibility.spec, 1.7, 1.8 sources, 1.6, 1.7
- Next message (by thread): rpms/rhpl/devel rhpl.spec,1.54,1.55 sources,1.51,1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list