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

- build for Fedora with native bits

Browse Source 
- downgrade from previous 3.1M4 builds with epoch
- add Epoch to Requires sub-packages references
- build ecj and then use that ecj to build the rest
- add native compilation and files to respective %files
- add resources.jar.so workaround
- update patches for 3.0.1
- add new patches
This commit is contained in:
Andrew Overholt 2005-01-24 15:23:02 +00:00
parent 297360d882
commit 921a570b86
2 changed files with 244 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

469
eclipse.spec
View File

@ -3,21 +3,18 @@
# The intersection of the IBM-supported platforms and # The intersection of the IBM-supported platforms and
# the platforms we want. # the platforms we want.
ExclusiveArch: i386 ppc ppc64 ExclusiveArch: i386
Epoch: 1
%define pkg_summary An open extensible IDE %define pkg_summary An open extensible IDE
%define section free %define section free
%define swt_version 3116 %define swt_version 3063
%define corelib_version 2_1_0b %define corelib_version 2_1_0b
%define eclipse_major 3 %define eclipse_major 3
%define eclipse_minor 1 %define eclipse_minor 0
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor} %define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%define eclipse_oldmajmin 3.0 %define eclipse_micro 1
%define eclipse_micro 0
%define eclipse_milestone M4
%define full_version %{eclipse_major}.%{eclipse_minor}%{eclipse_milestone}
%define libname libswt3 %define libname libswt3
%define selfbuild 1
%ifarch %{ix86} %ifarch %{ix86}
%define eclipse_arch x86 %define eclipse_arch x86
@ -54,12 +51,12 @@ ExclusiveArch: i386 ppc ppc64
Summary: %{pkg_summary} Summary: %{pkg_summary}
Name: eclipse Name: eclipse
Version: %{eclipse_majmin} Version: %{eclipse_majmin}.%{eclipse_micro}_fc
Release: 0.%{eclipse_milestone}.21 Release: 7
License: CPL License: CPL
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
Source0: ftp://download.eclipse.org/S-3.1M4-200412162000/eclipse-sourceBuild-srcIncluded-3.1M4.zip Source0: http://download.eclipse.org/downloads/drops/R-3.0.1-200409161125/eclipse-sourceBuild-srcIncluded-3.0.1.zip
Source1: %{name}.script Source1: %{name}.script
Source2: %{name}.desktop Source2: %{name}.desktop
Source3: %{name}-16.gif Source3: %{name}-16.gif
@ -76,10 +73,14 @@ Source18: %{name}-redhat-splash.png
Source20: %{name}-rhdocs-r20041017.tar.gz Source20: %{name}-rhdocs-r20041017.tar.gz
Source21: %{name}-copy-platform.sh Source21: %{name}-copy-platform.sh
Source22: %{name}-tutorials.pdf Source22: %{name}-tutorials.pdf
Source23: %{name}-jdt.jarswithnativelibs
Source24: %{name}-pde.jarswithnativelibs
Source25: %{name}-platform.jarswithnativelibs
Patch0: %{name}-make-gtk.patch Patch0: %{name}-make-gtk.patch
Patch1: %{name}-make-core.patch Patch1: %{name}-make-core.patch
Patch2: %{name}-make-gtk2.patch Patch2: %{name}-make-gtk2.patch
Patch9: %{name}-org.eclipse.core.resources-Makefile.patch
Patch16: %{name}-make-gtk3.patch Patch16: %{name}-make-gtk3.patch
Patch17: %{name}-platformOptions.patch Patch17: %{name}-platformOptions.patch
# We don't use this one yet but we want to keep it around. # We don't use this one yet but we want to keep it around.
@ -89,11 +90,11 @@ Patch19: %{name}-jnigen.patch
Patch20: %{name}-gtk-launcher.patch Patch20: %{name}-gtk-launcher.patch
Patch21: %{name}-org.eclipse.help.appserver-host.patch Patch21: %{name}-org.eclipse.help.appserver-host.patch
Patch22: %{name}-welcome-screen.patch Patch22: %{name}-welcome-screen.patch
Patch25: %{name}-webappcpfix.patch Patch23: %{name}-cvs-permission-bits.patch
Patch26: %{name}-webappcompiler.patch Patch24: %{name}-cvs-permission-bits2.patch
Patch27: %{name}-textsearch.patch Patch25: %{name}-search.patch
Patch28: %{name}-swtbuild.patch Patch26: %{name}-textsearch.patch
Patch29: %{name}-launcher.patch Patch27: %{name}-webappcpfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: ant BuildRequires: ant
@ -115,8 +116,8 @@ BuildRequires: gtk2-devel
# RH 8.0, 9, FC 1: glib2-devel # RH 8.0, 9, FC 1: glib2-devel
# BuildRequires: %{_libdir}/pkgconfig/gthread-2.0.pc # BuildRequires: %{_libdir}/pkgconfig/gthread-2.0.pc
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gcc4-java >= 4.0.0-0.17 BuildRequires: gcc4-java >= 4.0.0-0.21
BuildRequires: java-1.4.2-gcj4-compat-devel >= 1.4.2 BuildRequires: java-1.4.2-gcj4-compat-devel >= 1.4.2.0-2jpp
%description %description
@ -130,6 +131,7 @@ Summary: Eclipse Compiler for Java
Group: Development/Languages Group: Development/Languages
Obsoletes: ecj Obsoletes: ecj
Provides: ecj Provides: ecj
Requires: gcc4-java >= 4.0.0-0.21
%description ecj %description ecj
Eclipse compiler for Java. Eclipse compiler for Java.
@ -143,6 +145,7 @@ Provides: %{name}-sdk
Requires: java >= 1.4.2 Requires: java >= 1.4.2
Requires: %{name}-gtk2 Requires: %{name}-gtk2
Requires: /usr/bin/perl Requires: /usr/bin/perl
Requires: gcc4-java >= 4.0.0-0.21
%description platform %description platform
Eclipse platform common files. In addition to this, you'll need a UI package Eclipse platform common files. In addition to this, you'll need a UI package
@ -151,9 +154,9 @@ Eclipse platform common files. In addition to this, you'll need a UI package
%package gtk2 %package gtk2
Summary: GTK2 UI for the Eclipse IDE Summary: GTK2 UI for the Eclipse IDE
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
Provides: %{name}-ui = %{version}-%{release} Provides: %{name}-ui = %{epoch}:%{version}-%{release}
Requires: %{name}-platform = %{version}-%{release} Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{libname}-gtk2 = %{version}-%{release} Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
Requires: /usr/bin/mozilla Requires: /usr/bin/mozilla
%description gtk2 %description gtk2
@ -162,8 +165,9 @@ GTK2 UI for the Eclipse IDE.
%package jdt %package jdt
Summary: Eclipse Java development tools Summary: Eclipse Java development tools
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name}-ui = %{version}-%{release} Requires: %{name}-ui = %{epoch}:%{version}-%{release}
Requires: %{name}-ecj = %{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release}
Requires: gcc4-java >= 4.0.0-0.21
%description jdt %description jdt
Eclipse Java developments tools. Eclipse Java developments tools.
@ -178,9 +182,10 @@ Eclipse Source.
%package pde %package pde
Summary: Eclipse PDE Summary: Eclipse PDE
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name}-ui = %{version}-%{release} Requires: %{name}-ui = %{epoch}:%{version}-%{release}
Requires: %{name}-source = %{version}-%{release} Requires: %{name}-source = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt = %{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: gcc4-java >= 4.0.0-0.21
%description pde %description pde
Eclipse PDE. Eclipse PDE.
@ -200,8 +205,9 @@ popd
pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
%patch0 -p0 %patch0 -p0
popd popd
%patch1 -p0 %patch1 -p1
%patch2 -p0 %patch2 -p1
%patch9 -p0
pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
%patch16 -p0 %patch16 -p0
popd popd
@ -216,15 +222,18 @@ popd
pushd "plugins/org.eclipse.platform" pushd "plugins/org.eclipse.platform"
%patch22 -p0 %patch22 -p0
popd popd
%if %selfbuild pushd "plugins/org.eclipse.team.cvs.core"
pushd "plugins" %patch23 -p0
%patch25 -p1 popd
pushd "plugins/org.eclipse.team.cvs.ui"
%patch24 -p0
popd
pushd "plugins/org.eclipse.search"
%patch25 -p0
popd popd
%endif
%patch26 -p0 %patch26 -p0
%patch27 -p0 %patch27 -p0
%patch28 -p0
%patch29 -p0
# Red Hat splash screen. # Red Hat splash screen.
pushd plugins/org.eclipse.platform pushd plugins/org.eclipse.platform
@ -250,7 +259,7 @@ perl -pi -e 's|failonerror="[A-Za-z]*"|failonerror="yes"|g' \
# extend it later if need be. # extend it later if need be.
src= src=
dest= dest=
%ifarch sparc64 %ifarch ia64 ppc64 sparc64
src=amd64 src=amd64
dest=%{eclipse_arch} dest=%{eclipse_arch}
%endif %endif
@ -268,53 +277,46 @@ if test -n "$src"; then
fi fi
%build %build
export ANT_OPTS=-Xmx768m
%if %selfbuild ## -------- ecj build --------
### -------- ecj build -------- # Build ecj that we can use for the rest of the build
## Build ecj that we can use for the rest of the build
##
# #
## We're going to muck with this, so let's keep a clean copy
#cp -r plugins/org.eclipse.jdt.core plugins/org.eclipse.jdt.core.original # We're going to muck with this, so let's keep a clean copy
# cp -r plugins/org.eclipse.jdt.core plugins/org.eclipse.jdt.core.original
#pushd plugins/org.eclipse.jdt.core
#cp model/org/eclipse/jdt/core/Signature.java compiler/org/eclipse/jdt/core pushd plugins/org.eclipse.jdt.core
#cp -r batch/org/eclipse/jdt/internal/compiler/batch \ cp model/org/eclipse/jdt/core/Signature.java compiler/org/eclipse/jdt/core
# compiler/org/eclipse/jdt/internal/compiler cp -r batch/org/eclipse/jdt/internal/compiler/batch \
#cd compiler compiler/org/eclipse/jdt/internal/compiler
#for f in `find -name '*.java' -o -name '*.properties' | cut -c 3-`; do cd compiler
# gcj4 -I. -Wno-deprecated -C $f for f in `find -name '*.java' -o -name '*.properties' | cut -c 3-`; do
#done gcj -I. -Wno-deprecated -C $f
# done
#find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
# xargs jar cf ../../../ecj-bootstrap.jar find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
# xargs jar cf ../../../ecj-bootstrap.jar
#popd
# popd
## Let's return o.e.jdt.core to its original src state
#rm -rf plugins/org.eclipse.jdt.core # Let's return o.e.jdt.core to its original src state
#mv plugins/org.eclipse.jdt.core.original plugins/org.eclipse.jdt.core rm -rf plugins/org.eclipse.jdt.core
# mv plugins/org.eclipse.jdt.core.original plugins/org.eclipse.jdt.core
## Now use this built ecj for the rest of the build
#export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH # Now use this built ecj for the rest of the build
# FIXME: gcj PR 19295 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19295 export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH
export CLASSPATH=`pwd`/jdtcore.jar:$CLASSPATH javac -version
# -------- ecj build -------- # -------- ecj build --------
%endif
pushd plugins/org.eclipse.swt.tools pushd plugins/org.eclipse.swt.tools
rm -f swttools.jar rm -f swttools.jar
%{ant} \ %{ant} \
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-DjavacVerbose=false -DjavacFailOnError=true \
-Dbuild.compiler=modern \ -Dbuild.compiler=modern \
-DjavacVerbose=false -DjavacFailOnError=true \
-Dbootclasspath= -Dbootclasspath=
popd popd
%if %selfbuild
# I had to add stuff to the bootclasspath to get this to work with
# our pseudo-java-gcj-compat setup. --overholt
mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/' mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/'
%{ant} -buildfile build.xml \ %{ant} -buildfile build.xml \
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
@ -322,15 +324,6 @@ mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/'
-DjavacVerbose=false -DjavacFailOnError=true \ -DjavacVerbose=false -DjavacFailOnError=true \
-Dbootclasspath=%{_datadir}/java/libgcj-4.0.0.jar:%{_datadir}/java/xml-commons-apis-1.0.jar \ -Dbootclasspath=%{_datadir}/java/libgcj-4.0.0.jar:%{_datadir}/java/xml-commons-apis-1.0.jar \
compile compile
%else
mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/'
%{ant} -buildfile build.xml \
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-Dbuild.compiler=modern \
-DjavacVerbose=false -DjavacFailOnError=true \
-Dbootclasspath= \
compile
%endif
# FIXME: need a gjdoc RPM # FIXME: need a gjdoc RPM
## Overwrite eclipse.org documentation with our own and then build the docs ## Overwrite eclipse.org documentation with our own and then build the docs
@ -339,7 +332,7 @@ mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/'
#for buildDoc in `/usr/bin/gzip -dc %{SOURCE20} | tar -vxf - | grep build.xml`; do #for buildDoc in `/usr/bin/gzip -dc %{SOURCE20} | tar -vxf - | grep build.xml`; do
# pushd `echo $buildDoc | sed -e 's/build.xml//g'` # pushd `echo $buildDoc | sed -e 's/build.xml//g'`
# if [ -e buildDoc.xml ]; then # if [ -e buildDoc.xml ]; then
# %{ant} -f buildDoc.xml # java -cp ../../startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner -v -f buildDoc.xml
# fi # fi
# popd # popd
#done #done
@ -367,26 +360,21 @@ pushd "plugins/org.eclipse.swt${suff}/Eclipse SWT PI/gtk/library"
swtflags= swtflags=
%ifarch alpha ia64 ppc64 sparc64 x86_64 %ifarch alpha ia64 ppc64 sparc64 x86_64
swtflags='SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64' swtflags='SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64'
%ifarch x86_64 %ifarch ia64
# Sigh. # Sigh.
swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib64"
%else
swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib" swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib"
%endif %endif
%endif %endif
# FIXME: /usr/lib/gcc is because /usr/lib64/gcc... isn't correct on x86_64
make \ make \
$swtflags \ $swtflags \
JAVA_HOME="%{java_home}" \ JAVA_HOME="%{java_home}" \
JAVA_JNI="%{java_home}/include" \ JAVA_JNI="%{java_home}/include" \
AWT_LIB_PATH="%{java_home}/jre/bin" \ AWT_LIB_PATH="%{java_home}/jre/bin" \
JPACKAGE_CFLAGS="$RPM_OPT_FLAGS -DNO_LONG -I%{java_home}/include \ JPACKAGE_CFLAGS="$RPM_OPT_FLAGS -DNO_LONG -I%{java_home}/include -I%{java_home}/include/linux" \
-I%{java_home}/include/linux \
-I/usr/lib/gcc/%{arch}-redhat-linux/4.0.0/include/"\
MOZILLA_HOME="" \ MOZILLA_HOME="" \
MOZILLA_INCLUDE_BASE="/usr/include/mozilla-1.4.2" \ MOZILLA_INCLUDE_BASE="/usr/include/mozilla-1.4.2" \
MOZILLA_LIBFLAG="" \ MOZILLA_LIBFLAG="" \
-f make_linux.mak all -f make_gtk.mak all
mkdir -p ../../../os/linux/%{eclipse_arch} mkdir -p ../../../os/linux/%{eclipse_arch}
cp -p libswt-*.so ../../../os/linux/%{eclipse_arch} cp -p libswt-*.so ../../../os/linux/%{eclipse_arch}
popd popd
@ -399,34 +387,32 @@ DEFAULT_OS_ARCH="%{eclipse_arch}" \
DEFAULT_WS="gtk" \ DEFAULT_WS="gtk" \
PROGRAM_OUTPUT="eclipse" \ PROGRAM_OUTPUT="eclipse" \
PROGRAM_NAME="Eclipse" \ PROGRAM_NAME="Eclipse" \
-f make_linux.mak clean all -f make_gtk.mak clean all
mkdir -p ../../bin/gtk/linux/%{eclipse_arch} cp -p eclipse ../../bin/linux/gtk
cp -p eclipse ../../bin/gtk/linux/%{eclipse_arch}
popd popd
cp -p plugins/platform-launcher/bin/gtk/linux/%{eclipse_arch}/eclipse . cp -p plugins/platform-launcher/bin/linux/gtk/eclipse .
pushd plugins/org.eclipse.core.resources.linux/src pushd plugins/org.eclipse.core.resources.linux/src
make JPACKAGE_CFLAGS="$RPM_OPT_FLAGS" make JDK_INCLUDE="%{java_home}/include" JPACKAGE_CFLAGS="$RPM_OPT_FLAGS -I%{java_home}/include -I%{java_home}/include/linux"
mkdir -p ../os/linux/%{eclipse_arch} mkdir -p ../os/linux/%{eclipse_arch}
cp -p libcore_*.so ../os/linux/%{eclipse_arch} cp -p libcore_*.so ../os/linux/%{eclipse_arch}
popd popd
# This could probably be done with build.xml in this directory
pushd plugins/org.eclipse.update.core.linux/src pushd plugins/org.eclipse.update.core.linux/src
gcc $RPM_OPT_FLAGS -fPIC -o libupdate.so -shared *.c -I. -I%{java_home}/include gcc $RPM_OPT_FLAGS -fPIC -o libupdate.so -shared *.c -I. -I%{java_home}/include -I%{java_home}/include/linux
popd
pushd plugins/org.eclipse.team.cvs.core/library
make \
JAVA_HOME="%{java_home}" \
OS="linux" \
clean all
popd popd
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
# FIXME: gcj PR 19295 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19295 export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH
#export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH
export CLASSPATH=`pwd`/jdtcore.jar:$CLASSPATH
#export ANT_OPTS=-Xmx768m
# I had to add stuff to the bootclasspath to get this to work with our
# pseudo java-gcj-compat setup. --overholt
%if %selfbuild
%{ant} \ %{ant} \
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-Dbuild.compiler=modern \ -Dbuild.compiler=modern \
@ -434,22 +420,14 @@ export CLASSPATH=`pwd`/jdtcore.jar:$CLASSPATH
-Djavadoc=%{javadoc} \ -Djavadoc=%{javadoc} \
-Dbootclasspath=%{_datadir}/java/libgcj-4.0.0.jar:%{_datadir}/java/xml-commons-apis-1.0.jar \ -Dbootclasspath=%{_datadir}/java/libgcj-4.0.0.jar:%{_datadir}/java/xml-commons-apis-1.0.jar \
install install
%else
%{ant} \
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-Dbuild.compiler=modern \
-DjavacVerbose=false -DjavacFailOnError=true \
-Dbootclasspath= \
-Djavadoc=%{javadoc} \
install
%endif
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
find result -type f -name "*.zip" -exec unzip -d $RPM_BUILD_ROOT%{_datadir} {} \; find result -type f -name "*.zip" -exec unzip -d $RPM_BUILD_ROOT%{_datadir} {} \;
install -m 644 plugins/org.eclipse.platform/startup.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/startup.jar install -m 644 plugins/org.eclipse.platform/startup.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/startup.jar
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_*/startup.jar rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_*/startup.jar
install -m 644 plugins/platform-launcher/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm install -m 644 plugins/platform-launcher/bin/linux/gtk/icon.xpm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm
# binaries and libs # binaries and libs
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
@ -471,7 +449,7 @@ suff=.gtk64/src
cp -p plugins/org.eclipse.update.core.linux/src/libupdate*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/ cp -p plugins/org.eclipse.update.core.linux/src/libupdate*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
cp -p plugins/org.eclipse.core.resources.linux/os/linux/%{eclipse_arch}/libcore_*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/ cp -p plugins/org.eclipse.core.resources.linux/os/linux/%{eclipse_arch}/libcore_*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
cp -p plugins/org.eclipse.swt${suff}/os/linux/%{eclipse_arch}/libswt*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/ cp -p plugins/org.eclipse.swt${suff}/os/linux/%{eclipse_arch}/libswt*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
#cp -p plugins/org.eclipse.team.cvs.core/library/libcvs.so $RPM_BUILD_ROOT%{_libdir}/%{name}/ cp -p plugins/org.eclipse.team.cvs.core/library/libcvs.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
pushd $RPM_BUILD_ROOT%{_libdir}/%{name} pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
chmod 755 eclipse *.so chmod 755 eclipse *.so
@ -481,8 +459,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_jnidir}
install -d -m 755 $RPM_BUILD_ROOT%{_libdir} install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
### begin core lib symlinks ### begin core lib symlinks
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajmin}.%{eclipse_micro}/os/linux/%{eclipse_arch} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajmin}.%{eclipse_micro}/os/linux/%{eclipse_arch} pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
ln -sf %{_libdir}/%{name}/libcore_%{corelib_version}.so libcore_%{corelib_version}.so ln -sf %{_libdir}/%{name}/libcore_%{corelib_version}.so libcore_%{corelib_version}.so
popd popd
@ -501,8 +479,8 @@ done
popd popd
pushd $RPM_BUILD_ROOT%{_jnidir} pushd $RPM_BUILD_ROOT%{_jnidir}
ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar swt-gtk-%{full_version}.jar ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar swt-gtk-%{version}.jar
ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{full_version}.jar ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
popd popd
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
@ -617,19 +595,33 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \
$RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
%if %selfbuild rm ecj-bootstrap.jar
# FIXME: gcj PR 19295
#rm ecj-bootstrap.jar
%endif
%post platform %post ecj
# FIXME: we will need to put the proper .sos in the proper sub-packages' %post gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
# sections %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \
for j in `cat %{_datadir}/%{name}/eclipsecompiledjars.list`; do %{_libdir}/%{name}/jdtcore.jar.so
gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar \
%{_libdir}/%{name}/jdtCompilerAdapter.jar.so
%post jdt
for j in `cat %{SOURCE23}`; do
gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \ gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
$j %{_libdir}/%{name}/`basename $j`.so; $j %{_libdir}/%{name}/`basename $j`.so;
done done
%post pde
for j in `cat %{SOURCE24}`; do
gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
$j %{_libdir}/%{name}/`basename $j`.so;
done
%post platform
for j in `cat %{SOURCE25}`; do
gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
$j %{_libdir}/%{name}/`basename $j`.so;
done
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -639,26 +631,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.* %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
%{_datadir}/java/jdtcore*.jar %{_datadir}/java/jdtcore*.jar
%{_libdir}/%{name}/jdtcore.jar.so # Native bits
%files platform -f %{name}-platform.install
%defattr(0644,root,root,0755)
%dir %{_datadir}/%{name}
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.so
%{_datadir}/%{name}/.eclipseproduct
%{_datadir}/%{name}/eclipsecompiledjars.list
%{_libdir}/%{name}/eclipse.db %{_libdir}/%{name}/eclipse.db
%{_datadir}/%{name}/startup.jar %attr(0644,root,root) %{_libdir}/%{name}/jdtcore.jar.so
%{_datadir}/%{name}/icon.xpm %attr(0644,root,root) %{_libdir}/%{name}/jdtCompilerAdapter.jar.so
%{_datadir}/%{name}/eclipse
%attr(0755,root,root) %{_datadir}/%{name}/buildscripts/copy-platform
# formerly in scripts
%attr(0755,root,root) %{_bindir}/eclipse
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/icons/*/*/apps/*
%config(noreplace) %{_sysconfdir}/eclipse.conf
%files gtk2 -f %{name}-gtk.install %files gtk2 -f %{name}-gtk.install
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
@ -666,7 +642,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n %{libname}-gtk2 %files -n %{libname}-gtk2
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
/usr/share/eclipse/plugins/org.eclipse.swt.gtk*_3.* %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_3.*
%attr(0755,root,root) %{_libdir}/%{name}/libswt-gnome-gtk-*.so %attr(0755,root,root) %{_libdir}/%{name}/libswt-gnome-gtk-*.so
%attr(0755,root,root) %{_libdir}/%{name}/libswt-gtk-*.so %attr(0755,root,root) %{_libdir}/%{name}/libswt-gtk-*.so
%attr(0755,root,root) %{_libdir}/%{name}/libswt-pi-gtk-*.so %attr(0755,root,root) %{_libdir}/%{name}/libswt-pi-gtk-*.so
@ -674,101 +650,144 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libswt-*.so %{_libdir}/libswt-*.so
%{_jnidir}/swt-gtk*.jar %{_jnidir}/swt-gtk*.jar
%{_jnidir}/swt-pi-gtk*.jar %{_jnidir}/swt-pi-gtk*.jar
%attr(0664,root,root) %{_libdir}/%{name}/swt-mozilla.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/swt-pi.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/swt.jar.so
%files jdt -f %{name}-jdt.install %files jdt -f %{name}-jdt.install
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
# Native bits
%{_libdir}/%{name}/eclipse.db
%attr(0664,root,root) %{_libdir}/%{name}/jdiui.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/snippetsupport.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/jdimodel.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/jdi.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/junitsupport.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/junitruntime.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/launching.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/launchingsupport.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/jdt.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/junit.jar.so
%files source -f %{name}-source.install %files source -f %{name}-source.install
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%files pde -f %{name}-pde.install %files pde -f %{name}-pde.install
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
# Native bits
%{_libdir}/%{name}/eclipse.db
%attr(0664,root,root) %{_libdir}/%{name}/pdebuild-ant.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/pdebuild.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/pdecore.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/pdejunit.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/pdert.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/pdeuiant.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/pdeui.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/pde.jar.so
%attr(0664,root,root) %{_libdir}/%{name}/pde-ant.jar.so
%files platform -f %{name}-platform.install
%defattr(0644,root,root,0755)
%dir %{_datadir}/%{name}
%dir %{_libdir}/%{name}
%{_datadir}/%{name}/.eclipseproduct
%{_datadir}/%{name}/eclipsecompiledjars.list
%{_datadir}/%{name}/startup.jar
%{_datadir}/%{name}/icon.xpm
%attr(0755,root,root) %{_libdir}/%{name}/libcore*
%attr(0755,root,root) %{_libdir}/%{name}/libupdate*
%{_datadir}/%{name}/eclipse
%attr(0755,root,root) %{_datadir}/%{name}/buildscripts/copy-platform
%attr(0755,root,root) %{_libdir}/%{name}/libcvs.so
# formerly in scripts
%attr(0755,root,root) %{_bindir}/eclipse
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/icons/*/*/apps/*
# Native bits
%{_libdir}/%{name}/eclipse.db
%attr(0644,root,root) %{_libdir}/%{name}/parser.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/antsupport.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/compare.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/boot.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/expressions.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/filebuffers.jar.so
# FIXME: re-add resources.jar to eclipse-platform.jarswithnativelibs
#%attr(0644,root,root) %{_libdir}/%{name}/resources.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/runtime.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/variables.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/dtcore.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/dtui.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/helpbase.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/helpide.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/helpui.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/appserver.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/help.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/jface.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/jfacetext.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/refcore.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/refui.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/services.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/util.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/activeHelpSample.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/platform.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/search.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/team.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/cvs.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/teamcvsssh.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/jsch-0.1.16.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/teamcvsui.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/teamui.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/text.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/cheatsheets.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/console.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/externaltools.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/forms.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/ide.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/intro.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/ui.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/workbench.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/compatibility.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/texteditor.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/editors.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/r21.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/views.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/configurator.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/updatecore.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/scheduler.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/updateui.jar.so
# FIXME until libgcj contains gnujaxp (libgcj PR 19301)
%attr(0644,root,root) %{_libdir}/%{name}/xalan-j2-2.6.0.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/xerces-j2-2.6.2.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/xml-commons-apis-1.0.jar.so
# The rest of the native libraries
%{_libdir}/%{name}/*.so
%config(noreplace) %{_sysconfdir}/eclipse.conf
%changelog %changelog
* Tue Jan 18 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.21 * Fri Jan 21 2005 Andrew Overholt <overholt@redhat.com> 1:3.0.1_fc-1
- explicitly require java-1.4.2-gcj4-compat-devel - build for Fedora with native bits
- downgrade from previous 3.1M4 builds with epoch
- add Epoch to Requires sub-packages references
- build ecj and then use that ecj to build the rest
- add native compilation and files to respective %files
- add resources.jar.so workaround
* Mon Jan 17 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.20 * Tue Jan 11 2005 Aaron Luchko <aluchko@redhat.com> 3.0.1-8
- add ppc64 - fixed minor typo in eclipse-redhat-splash.png
* Mon Jan 17 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.19 * Tue Jan 11 2005 Aaron Luchko <aluchko@redhat.com> 3.0.1-7
- more 64-bit platform and launching script fixes - updated copyright date on eclipse-redhat-splash.png
- add ppc
* Sat Jan 15 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.18 * Wed Jan 5 2005 Aaron Luchko <aluchko@redhat.com> 3.0.1-6
- script path fixes - fixed problem in search.patch
- x86_64 fixes
* Fri Jan 14 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.17 * Fri Dec 17 2004 Aaron Luchko <aluchko@redhat.com> 3.0.1-5
- sed typo - added search.patch a backported bugfix from 3.1.0
* Fri Jan 14 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.15 * Mon Dec 06 2004 Aaron Luchko <aluchko@redhat.com> 3.0.1-4
- fix /usr/share -> /usr/lib error in launcher script - changed eclipse.script to use /usr/bin/java when no jvm is supplied
- only add to the db those jar-so combinations that we've compiled
* Fri Jan 14 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.12
- typos in %files
* Fri Jan 14 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.11
- remove ppc for now
* Fri Jan 14 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.10
- make PDE depend upon JDT
- move precompiled db to %{_libdir}/eclipse
- modify launching script to use compiled .sos
- rename compiled .sos to be .jar.so instead of .so
- for now, do dbtool adding in platform install
* Wed Jan 12 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.9
- add ppc
- add launcher and swt patches
* Wed Jan 12 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.7
- make jdtcore*.jar part of eclipse-ecj
* Wed Jan 12 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.6
- use installed java-devel rpm instead of bootstrapping one
* Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.5
- fix when we set JAVA_HOME variable
* Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.2
- fix typos
* Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.1
- fix versioning and release to upgrade cleanly
* Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1.M4-9
- add Provides: ecj for eclipse-ecj
* Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1.M4-9
- update patches
* Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1.M4-5
- import all necessary patches
* Mon Jan 10 2005 Andrew Overholt <overholt@redhat.com> 3.1.M4-4
- fix /usr/lib -> %{_datadir} to be /usr/lib -> %{_libdir} in
%{_bindir}/eclipse
* Mon Jan 10 2005 Andrew Overholt <overholt@redhat.com> 3.1.M4-3
- add xerces
* Mon Jan 10 2005 Andrew Overholt <overholt@redhat.com> 3.1.M4-2
- fold ecj-native into ecj
- add FIXMEs for necessary work
- add xml .jar->.so compilations so we can work without gnujaxp
- modify launching script to take this into account
* Wed Jan 05 2005 Andrew Overholt <overholt@redhat.com> 3.1.M4-1
- new upstream milestone build
- re-organize sub-rpms
* Mon Dec 20 2004 Andrew Overholt <overholt@redhat.com> 3.0.1-4
- build ecj first and use it to build the rest
- add %selfbuild to toggle between builds with java-gcj-compat style and other
JREs
- fold scripts into platform
* Mon Nov 22 2004 Ben Konrath <bkonrath@redhat.com> 3.0.1-3 * Mon Nov 22 2004 Ben Konrath <bkonrath@redhat.com> 3.0.1-3
- split cvs-permission-bits.patch in two - split cvs-permission-bits.patch in two

1
sources
View File

@ -1,4 +1,3 @@
c95561df899a47fc05261531ed0b9221 eclipse-sourceBuild-srcIncluded-3.0.1.zip c95561df899a47fc05261531ed0b9221 eclipse-sourceBuild-srcIncluded-3.0.1.zip
87c0c34661b3e033a9d994ed8015d4c2 eclipse-rhdocs-r20041017.tar.gz 87c0c34661b3e033a9d994ed8015d4c2 eclipse-rhdocs-r20041017.tar.gz
423393fad6f9c220037d38d1098ffcec eclipse-tutorials.pdf 423393fad6f9c220037d38d1098ffcec eclipse-tutorials.pdf
9d529492c9cac1add34e96192504ac22 eclipse-sourceBuild-srcIncluded-3.1M4.zip