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

- Import 3.1RC3.

Browse Source 
- Use FileInitializer (e.o#90535) - this should eliminate .sos in
    ~/.eclipse.
- Add eclipse-filenamepatterns.txt ("*.so" currently) for above.
- Symlink JNI libraries.
Fri Jun 17 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC2.2
- Update to new naming scheme for resulting gzipped tarball.
- Add patch to not generate help indices (it seems to hang).
Thu Jun 16 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC2.1
- Import 3.1RC2.
- Add RCP sub-package. Unsure about its dependencies ATM.
This commit is contained in:
Andrew Overholt 2005-06-20 21:14:00 +00:00
parent 8572c32f67
commit fd64f0d26f
4 changed files with 224 additions and 973 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eclipse-build.patch
View File

@ -1,9 +1,14 @@
--- build.xml.orig 2005-02-19 11:43:10.000000000 -0500
+++ build.xml 2005-02-19 11:44:30.000000000 -0500
@@ -91,6 +91,15 @@
<arg line="build.sh"/>
--- build.xml.orig 2005-06-07 16:53:26.000000000 -0400
+++ build.xml 2005-06-16 16:07:11.000000000 -0400
@@ -72,6 +72,20 @@
<arg line="build.sh" />
</exec>
<move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/"/>
<move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" />
+
+ <delete dir="${launcherlibs}/library"/>
+
+ <!-- Copy icon for un-supported platforms -->
+ <copy file="features/org.eclipse.platform.launchers/bin/gtk/linux/x86/icon.xpm" todir="${launcherlibs}/"/>
+
+ <!-- Build JNI libs -->
+ <!-- libcore -->
@ -14,5 +19,3 @@
+ <ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
+
</target>

1
eclipse-filenamepatterns.txt Normal file
View File

@ -0,0 +1 @@
*.so

1008
eclipse-updatehomedir.patch
View File

File diff suppressed because it is too large Load Diff

171
eclipse.spec
View File

@ -5,14 +5,14 @@ Epoch: 1
%define tomcatlibdir %{_var}/lib/tomcat5
%define pkg_summary An open, extensible IDE
%define section free
%define swt_version 3135
%define swt_version 3138
%define eclipse_major 3
%define eclipse_minor 1
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%define eclipse_micro 0
%define eclipse_oldmajminmic 3.0.0
%define libname libswt3
%define build_id I20050513-1415
%define build_id S-3.1RC3-200506171618
# All arches line up except i386 -> x86
%ifarch %{ix86}
@ -24,11 +24,11 @@ Epoch: 1
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
Release: 0.M7.9
Release: 0.RC3.1
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1M7-200505131415/eclipse-sourceBuild-srcIncluded-3.1M7.zip
Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1RC3-200506171618/eclipse-sourceBuild-srcIncluded-3.1RC3.zip
Source1: %{name}.script
Source2: %{name}.desktop
Source5: %{name}-48.png
@ -45,6 +45,7 @@ Source16: %{name}-copy-platform.sh
Source17: %{name}-efj-wrapper.sh
# this zip was taken from the M6 source drop
Source18: ecj-M5.zip
Source19: %{name}-filenamepatterns.txt
# Build libswt-mozilla
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
@ -53,11 +54,12 @@ Patch0: %{name}-make-linux.patch
# FIXME: these should be built by upstream build method
# http://www.bagu.org/eclipse/plugin-source-drops.html
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
# GNU XML issue identified by Michael Koch
Patch2: %{name}-build.patch
Patch3: %{name}-dontgeneratehelpindices.patch
Patch4: %{name}-libupdatebuild.patch
Patch5: %{name}-libupdatebuild2.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
Patch10: %{name}-icon.patch
# Use installed mozilla libs and headers
Patch11: %{name}-libswt-mozilla.patch
# We can't really commit to doing builds for these arches upstream, but we
@ -85,16 +87,12 @@ Patch21: %{name}-gnuformatterjdtui.patch
Patch22: %{name}-updatehomedir.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
Patch24: %{name}-fileinitializer.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=95690
Patch25: %{name}-build.xml-typo.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364
Patch26: %{name}-ecj-options.patch
# work around for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21637
Patch27: %{name}-startup-url.openStream.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
Patch28: %{name}-tomcat5.m7.patch
Patch29: %{name}-tomcat5-build.m7.patch
Patch30: %{name}-tomcat5-build.2.m7.patch
Patch28: %{name}-tomcat5.patch
Patch29: %{name}-tomcat5-build.patch
Patch30: %{name}-tomcat5-build.2.patch
Patch31: %{name}-webapp-tomcat5.patch
%if %{gcj_support}
@ -258,6 +256,28 @@ Requires: libgcj >= 4.0.0-2
%description -n %{libname}-gtk2
SWT Library for GTK2.
%package rcp
Summary: Eclipse Rich Client Platform
Group: Development/Languages
%if %{gcj_support}
Requires: libgcj >= 4.0.0-2
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
%else
Requires: java >= 1.4.2
%endif
%description rcp
Eclipse Rich Client Platform
%package rcp-devel
Summary: Eclipse RCP Source
Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt-devel = %{epoch}:%{version}-%{release}
%description rcp-devel
Source for RCP for use within Eclipse.
%prep
%setup -q -c
@ -270,9 +290,9 @@ pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
%endif
popd
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch10 -p0
%if %{gcj_support}
#%patch13 -p1
%endif
@ -299,13 +319,6 @@ popd
pushd plugins/org.eclipse.core.runtime
%patch24 -p0
popd
%patch25 -p2
pushd plugins/org.eclipse.jdt.core
%patch26 -p0
popd
pushd plugins/org.eclipse.platform
%patch27 -p0
popd
pushd plugins/org.eclipse.tomcat
%patch28 -p0
%patch29 -p0
@ -531,7 +544,7 @@ ant \
%if %{gcj_support}
pushd result
# De-compress resulting tarball
tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz
tar zxf linux-gtk-%{eclipse_arch}-sdk.tar.gz
pushd eclipse
@ -632,11 +645,15 @@ rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz
result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar (again)
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
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
java -cp startup.jar org.eclipse.core.launcher.Main -consolelog -application org.eclipse.core.runtime.initializer -fileInitializer %{SOURCE19}
popd
# Binaries, libraries, and natively-built shared libraries
@ -667,38 +684,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse \
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -sf %{_libdir}/%{name}/eclipse eclipse
## JNI libraries
#cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libupdate.so \
# $RPM_BUILD_ROOT%{_libdir}/%{name}/
#cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libcore_*.so \
# $RPM_BUILD_ROOT%{_libdir}/%{name}/
#suff=
#%ifarch alpha ia64 ppc64 sparc64 x86_64
#suff=64
#%endif
#cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \
# $RPM_BUILD_ROOT%{_libdir}/%{name}/
# Symlink JNI libraries
for l in `find configuration -name \*.so`; do
mv $l $RPM_BUILD_ROOT%{_libdir}/%{name};
pushd `dirname $l`;
ln -sf %{_libdir}/%{name}/`basename $l`;
popd
done
popd
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
chmod -R 755 eclipse *.so
popd
#### begin libswt-gtk2 symlinks
#pushd $RPM_BUILD_ROOT%{_libdir}
#for base in awt-gtk mozilla-gtk atk-gtk gnome-gtk gtk pi-gtk; do
# ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
# libswt-${base}-%{swt_version}.so
#done
#popd
### begin libswt-gtk2 symlinks
pushd $RPM_BUILD_ROOT%{_libdir}
for base in awt-gtk atk-gtk mozilla-gtk gnome-gtk gtk pi-gtk; do
ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
libswt-${base}-%{swt_version}.so
done
popd
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
pushd $RPM_BUILD_ROOT%{_javadir}
ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-mozilla.jar swt-mozilla-%{version}.jar
#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-cairo.jar swt-cairo-%{version}.jar
popd
### end libswt-gtk2 symlinks
@ -870,6 +878,7 @@ gcj-dbtool -n $gcjdbdir/libswt3-gtk2.db 80000
gcj-dbtool -n $gcjdbdir/%{name}-platform.db 80000
gcj-dbtool -n $gcjdbdir/%{name}-jdt.db 80000
gcj-dbtool -n $gcjdbdir/%{name}-pde.db 80000
gcj-dbtool -n $gcjdbdir/%{name}-rcp.db 80000
# ecj db
gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \
@ -901,6 +910,16 @@ for dir in `cat %{SOURCE8}`; do
done;
done
# rcp db
for j in `find $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins/org.eclipse.rcp_3.* \
-name \*.jar`; do
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
if [ -f $lib ]; then
gcj-dbtool -f $gcjdbdir/%{name}-rcp.db \
$j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
fi;
done
# platform db
for dir in `cat %{SOURCE9}`; do
for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
@ -937,6 +956,9 @@ rm -rf $RPM_BUILD_ROOT
%post pde
%{_bindir}/rebuild-gcj-db %{_libdir}
%post rcp
%{_bindir}/rebuild-gcj-db %{_libdir}
%post -n %{libname}-gtk2
%{_bindir}/rebuild-gcj-db %{_libdir}
%endif
@ -960,6 +982,9 @@ fi
%postun pde
%{_bindir}/rebuild-gcj-db %{_libdir}
%postun rcp
%{_bindir}/rebuild-gcj-db %{_libdir}
%postun -n %{libname}-gtk2
%{_bindir}/rebuild-gcj-db %{_libdir}
%endif
@ -996,17 +1021,10 @@ fi
%dir %{_datadir}/%{name}/plugins
%dir %{_datadir}/%{name}/features
%dir %{_datadir}/%{name}/configuration
#%{_libdir}/%{name}/libswt-gnome-gtk-*.so
#%{_libdir}/%{name}/libswt-gtk-*.so
#%{_libdir}/%{name}/libswt-pi-gtk-*.so
#%{_libdir}/%{name}/libswt-atk-gtk-*.so
#%{_libdir}/%{name}/libswt-awt-gtk-*.so
#%{_libdir}/%{name}/libswt-mozilla-gtk-*.so
#%{_libdir}/libswt-*.so
%{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles/37
%{_libdir}/%{name}/libswt-*.so
%{_libdir}/libswt-*.so
%{_javadir}/swt-gtk*.jar
#%{_javadir}/swt-pi-gtk*.jar
#%{_javadir}/swt-mozilla*.jar
#%{_javadir}/swt-cairo*.jar
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/libswt3-gtk2.db
@ -1055,13 +1073,28 @@ fi
%{_datadir}/%{name}/plugins/org.eclipse.pde.source_3.*
%{_datadir}/%{name}/features/org.eclipse.pde.source_3.*
%files rcp
%{_datadir}/%{name}/features/org.eclipse.rcp_3.*
%{_datadir}/%{name}/plugins/org.eclipse.rcp_3.*
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-rcp.db
%{_libdir}/%{name}/plugins/org.eclipse.rcp_3.1.0.jar.so
%endif
%files rcp-devel
%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_3.*
%{_datadir}/%{name}/plugins/org.eclipse.rcp.source.linux*
%{_datadir}/%{name}/features/org.eclipse.rcp.source_3.*
%files platform -f %{name}-platform.install
%{_datadir}/%{name}/.eclipseproduct
%{_datadir}/%{name}/startup.jar
%{_datadir}/%{name}/buildscripts
%{_libdir}/%{name}/eclipse
#%{_libdir}/%{name}/libcore*
#%{_libdir}/%{name}/libupdate*
%{_libdir}/%{name}/libcore*
%{_libdir}/%{name}/libupdate*
%{_datadir}/%{name}/configuration
%{_datadir}/%{name}/eclipse
%{_bindir}/eclipse
%{_datadir}/applications/*
@ -1094,7 +1127,7 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so.bak
%{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_3.1.0.jar.so
@ -1103,8 +1136,8 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.0.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.0.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.platform_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.search_3.1.0.jar.so
@ -1112,7 +1145,7 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_3.1.0.jar.so
@ -1134,6 +1167,20 @@ fi
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
* Mon Jun 20 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC3.1
- Import 3.1RC3.
- Use FileInitializer (e.o#90535) - this should eliminate .sos in ~/.eclipse.
- Add eclipse-filenamepatterns.txt ("*.so" currently) for above.
- Symlink JNI libraries.
* Fri Jun 17 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC2.2
- Update to new naming scheme for resulting gzipped tarball.
- Add patch to not generate help indices (it seems to hang).
* Thu Jun 16 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC2.1
- Import 3.1RC2.
- Add RCP sub-package. Unsure about its dependencies ATM.
* Tue Jun 14 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M7.9
- Add tomcat5 patch and symlinks.