- Add patch to build libswt-mozilla.
- Build libswt-awt. - Add 64-bit swt lib list.
This commit is contained in:
Andrew Overholt
parent
371477158b
commit
ad7296ca38
49
eclipse.spec
49
eclipse.spec
@ -34,7 +34,7 @@ ExclusiveArch: i386 x86_64 ppc
|
||||
Summary: %{pkg_summary}
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
|
||||
Release: 0.M5.8
|
||||
Release: 0.M5.9
|
||||
License: CPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
@ -54,8 +54,9 @@ Source13: %{name}-pde.jarswithnativelibs
|
||||
Source14: %{name}-platform.jarswithnativelibs
|
||||
Source15: %{libname}-gtk2.jarswithnativelibs
|
||||
Source16: %{name}-copy-platform.sh
|
||||
Source17: %{libname}-gtk2.jarswithnativelibs.64bit
|
||||
|
||||
# Don't build AWT
|
||||
# Build libswt-mozilla
|
||||
Patch0: %{name}-make-linux.patch
|
||||
# Work around libgcj #19132
|
||||
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19132
|
||||
@ -74,6 +75,10 @@ Patch8: %{name}-antsecuritymanager.patch
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86571
|
||||
Patch9: %{name}-pdebuildtarargs.patch
|
||||
Patch10: %{name}-icon.patch
|
||||
# Use installed mozilla libs and headers
|
||||
Patch11: %{name}-libswt-mozilla.patch
|
||||
# Copy over the source files first
|
||||
Patch12: %{name}-libswt-mozilla2.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: ant
|
||||
@ -82,6 +87,8 @@ BuildRequires: jpackage-utils >= 0:1.5, make, gcc
|
||||
BuildRequires: gnome-vfs2-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: mozilla
|
||||
BuildRequires: mozilla-devel
|
||||
BuildRequires: gcc-java >= 4.0.0-0.30
|
||||
BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_4rh
|
||||
|
||||
@ -195,6 +202,7 @@ SWT Library for GTK2.
|
||||
# I hate spaces in paths with patch!
|
||||
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
|
||||
%patch0 -p0
|
||||
%patch11 -p0
|
||||
popd
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
@ -205,6 +213,7 @@ popd
|
||||
%patch8 -p0
|
||||
%patch9 -p0
|
||||
%patch10 -p0
|
||||
%patch12 -p0
|
||||
|
||||
# Red Hat splash screen.
|
||||
pushd plugins/org.eclipse.platform
|
||||
@ -336,6 +345,13 @@ gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
|
||||
jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj
|
||||
ln -s jdtcore.jar.so lib-org-eclipse-jdt.so
|
||||
|
||||
# /usr/lib -> /usr/lib64
|
||||
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
|
||||
perl -pe 's|/usr/lib/|%{_libdir}/|g' \
|
||||
build.sh > build.sh.patched
|
||||
mv build.sh.patched build.sh
|
||||
popd
|
||||
|
||||
# Use this ecj and our built jars
|
||||
export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
|
||||
export CLASSPATH=jdtcore.jar:jdtCompilerAdapter.jar:$CLASSPATH
|
||||
@ -443,8 +459,7 @@ popd
|
||||
|
||||
### begin libswt-gtk2 symlinks
|
||||
pushd $RPM_BUILD_ROOT%{_libdir}
|
||||
#for base in mozilla-gtk atk-gtk gnome-gtk gtk pi-gtk; do
|
||||
for base in atk-gtk gnome-gtk gtk pi-gtk; do
|
||||
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
|
||||
@ -456,6 +471,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}
|
||||
ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar swt-gtk-%{version}.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
|
||||
|
||||
@ -607,6 +623,10 @@ install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
|
||||
%ifarch alpha ia64 ppc64 sparc64 x86_64
|
||||
install -m 644 %{SOURCE17} $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
%endif
|
||||
|
||||
# Copy jdtcore.jar to %{_datadir}/java for eclipse-ecj
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
|
||||
ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \
|
||||
@ -654,10 +674,17 @@ if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
|
||||
fi
|
||||
|
||||
%post -n %{libname}-gtk2
|
||||
%ifarch alpha ia64 ppc64 sparc64 x86_64
|
||||
for j in `cat %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs.64bit`; do
|
||||
gcj-dbtool -a %{_libdir}/%{name}/mappings/libswt3-gtk2.db \
|
||||
$j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
|
||||
done
|
||||
%else
|
||||
for j in `cat %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs`; do
|
||||
gcj-dbtool -a %{_libdir}/%{name}/mappings/libswt3-gtk2.db \
|
||||
$j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
|
||||
done
|
||||
%endif
|
||||
if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
|
||||
gcj-dbtool -m %{_libdir}/%{name}/eclipse.db `find %{_libdir}/%{name}/mappings -name \*.db`
|
||||
fi
|
||||
@ -712,11 +739,13 @@ fi
|
||||
%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-atk-gtk-*.so
|
||||
# FIXME: should we be building this?
|
||||
#%attr(0755,root,root) %{_libdir}/%{name}/libswt-mozilla-gtk-*.so
|
||||
%{_libdir}/%{name}/libswt-awt-gtk-*.so
|
||||
%{_libdir}/%{name}/libswt-mozilla-gtk-*.so
|
||||
%{_libdir}/libswt-*.so
|
||||
%{_javadir}/swt-gtk*.jar
|
||||
%{_javadir}/swt-pi-gtk*.jar
|
||||
%{_javadir}/swt-mozilla*.jar
|
||||
%{_javadir}/swt-cairo*.jar
|
||||
# Native bits
|
||||
%{_libdir}/%{name}/eclipse.db
|
||||
#%attr(0755,root,root) %{_libdir}/%{name}/eclipse-mergedbs.sh
|
||||
@ -727,15 +756,16 @@ fi
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt-mozilla.jar.so
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt-cairo.jar.so
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt.jar.so
|
||||
%attr(0644,root,root) %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs.64bit
|
||||
%else
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-pi.jar.so
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-mozilla.jar.so
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-cairo.jar.so
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt.jar.so
|
||||
%attr(0644,root,root) %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs
|
||||
%endif
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface_3.1.0/jface.jar.so
|
||||
%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0/jfacetext.jar.so
|
||||
%attr(0644,root,root) %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs
|
||||
|
||||
%files jdt -f %{name}-jdt.install
|
||||
%defattr(0644,root,root,0755)
|
||||
@ -933,6 +963,11 @@ fi
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
|
||||
|
||||
%changelog
|
||||
* Thu Mar 03 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.9
|
||||
- Add patch to build libswt-mozilla.
|
||||
- Build libswt-awt.
|
||||
- Add 64-bit swt lib list.
|
||||
|
||||
* Tue Mar 01 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.8
|
||||
- Add ppc.
|
||||
- Add patch to copy over icon for unsupported (upstream) platforms but don't
|
||||
|
||||
Loading…
Reference in New Issue
Block a user