- Patch org.eclipse.help.webapp jasper classpath.
Thu Nov 03 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_5fc - Import work done by Debian Eclipse packagers: - Add Fedora version in Eclipse about dialog. - Update eclipse-javadoc.patch to match Debian's disable-filelog patch. - Remove buildDoc patches and add helpindexbuilder patch (e.o#114001). - Add patches to build Cairo SWT bindings.
This commit is contained in:
parent
a6f2bdd70e
commit
21044162c5
71
eclipse.spec
71
eclipse.spec
@ -23,7 +23,7 @@ Epoch: 1
|
|||||||
Summary: %{pkg_summary}
|
Summary: %{pkg_summary}
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 1jpp_4fc
|
Release: 1jpp_6fc
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -43,11 +43,10 @@ Source17: %{name}-efj-wrapper.sh
|
|||||||
Source18: ecj-M5.zip
|
Source18: ecj-M5.zip
|
||||||
Source19: %{name}-filenamepatterns.txt
|
Source19: %{name}-filenamepatterns.txt
|
||||||
Source20: ecj.sh.in
|
Source20: ecj.sh.in
|
||||||
Source21: buildDocPlugins.sh
|
|
||||||
|
|
||||||
# Build libswt-mozilla
|
# Build libswt-mozilla and libswt-cairo and use O2
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
|
||||||
Patch0: %{name}-make-linux.patch
|
Patch0: %{name}-libswt-enableallandO2.patch
|
||||||
# Build JNI libs
|
# Build JNI libs
|
||||||
# FIXME: these should be built by upstream build method
|
# FIXME: these should be built by upstream build method
|
||||||
# http://www.bagu.org/eclipse/plugin-source-drops.html
|
# http://www.bagu.org/eclipse/plugin-source-drops.html
|
||||||
@ -55,7 +54,6 @@ Patch0: %{name}-make-linux.patch
|
|||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
|
||||||
# GNU XML issue identified by Michael Koch
|
# GNU XML issue identified by Michael Koch
|
||||||
Patch2: %{name}-build.patch
|
Patch2: %{name}-build.patch
|
||||||
Patch3: %{name}-dontgeneratehelpindices.patch
|
|
||||||
Patch4: %{name}-libupdatebuild.patch
|
Patch4: %{name}-libupdatebuild.patch
|
||||||
Patch5: %{name}-libupdatebuild2.patch
|
Patch5: %{name}-libupdatebuild2.patch
|
||||||
# Use installed mozilla libs and headers
|
# Use installed mozilla libs and headers
|
||||||
@ -90,24 +88,28 @@ Patch28: %{name}-tomcat5.patch
|
|||||||
Patch29: %{name}-tomcat5-build.patch
|
Patch29: %{name}-tomcat5-build.patch
|
||||||
Patch30: %{name}-tomcat5-build.2.patch
|
Patch30: %{name}-tomcat5-build.2.patch
|
||||||
Patch31: %{name}-webapp-tomcat5.patch
|
Patch31: %{name}-webapp-tomcat5.patch
|
||||||
# We don't have cairo in FC4
|
|
||||||
Patch32: %{name}-swt-nocairo.fc4.patch
|
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707
|
||||||
Patch33: %{name}-compare-create-api.patch
|
Patch33: %{name}-compare-create-api.patch
|
||||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
|
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
|
||||||
Patch34: %{name}-bz162177.patch
|
Patch34: %{name}-bz162177.patch
|
||||||
Patch35: %{name}-javadoc.patch
|
Patch35: %{name}-genjavadocoutput.patch
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=105430
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=105430
|
||||||
Patch36: %{name}-ecj-classpath.patch
|
Patch36: %{name}-ecj-classpath.patch
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=109253
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=109253
|
||||||
# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168040
|
# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168040
|
||||||
Patch37: %{name}-gre64.conf.patch
|
Patch37: %{name}-gre64.conf.patch
|
||||||
# gij fails with the antRunner tasks for building the doc plugins
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
|
||||||
# so we use a shell script to call ant directly for each doc plug-in
|
Patch38: %{name}-helpindexbuilder.patch
|
||||||
Patch38: %{name}-buildDocPlugins.patch
|
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=111299
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=111299
|
||||||
Patch39: %{name}-e.o111299.patch
|
Patch39: %{name}-e.o111299.patch
|
||||||
Patch40: %{name}-usebuiltlauncher.patch
|
Patch40: %{name}-usebuiltlauncher.patch
|
||||||
|
# Build cairo libs
|
||||||
|
# Again, I hate patches with spaces in the filenames
|
||||||
|
Patch41: %{name}-libswt-cairo1.0-1.patch
|
||||||
|
Patch42: %{name}-libswt-cairo1.0-2.patch
|
||||||
|
Patch43: %{name}-libswt-cairo1.0-3.patch
|
||||||
|
Patch44: %{name}-libswt-cairo1.0-4.patch
|
||||||
|
Patch45: %{name}-webapp-jasperclasspath.patch
|
||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
ExcludeArch: s390 s390x ppc64 ia64
|
ExcludeArch: s390 s390x ppc64 ia64
|
||||||
@ -128,6 +130,7 @@ BuildRequires: mozilla = 37:1.7.12
|
|||||||
BuildRequires: mozilla-devel = 37:1.7.12
|
BuildRequires: mozilla-devel = 37:1.7.12
|
||||||
BuildRequires: nspr-devel
|
BuildRequires: nspr-devel
|
||||||
BuildRequires: libXtst-devel
|
BuildRequires: libXtst-devel
|
||||||
|
BuildRequires: cairo >= 1.0
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
BuildRequires: gcc-java >= 4.0.2
|
BuildRequires: gcc-java >= 4.0.2
|
||||||
BuildRequires: java-gcj-compat-devel >= 1.0.43
|
BuildRequires: java-gcj-compat-devel >= 1.0.43
|
||||||
@ -314,7 +317,6 @@ pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
|
|||||||
%endif
|
%endif
|
||||||
popd
|
popd
|
||||||
%patch2 -p0
|
%patch2 -p0
|
||||||
%patch3 -p0
|
|
||||||
%patch4 -p0
|
%patch4 -p0
|
||||||
%patch5 -p0
|
%patch5 -p0
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
@ -357,7 +359,6 @@ popd
|
|||||||
pushd plugins/org.eclipse.swt.motif.linux.x86
|
pushd plugins/org.eclipse.swt.motif.linux.x86
|
||||||
rm libcairo.so.1
|
rm libcairo.so.1
|
||||||
popd
|
popd
|
||||||
%patch32 -p0
|
|
||||||
pushd plugins/org.eclipse.compare
|
pushd plugins/org.eclipse.compare
|
||||||
%patch33 -p0
|
%patch33 -p0
|
||||||
popd
|
popd
|
||||||
@ -369,7 +370,20 @@ pushd plugins
|
|||||||
%patch39 -p0
|
%patch39 -p0
|
||||||
popd
|
popd
|
||||||
%patch40 -p0
|
%patch40 -p0
|
||||||
cp %{SOURCE21} .
|
# Again, I hate spaces in patches
|
||||||
|
pushd plugins/org.eclipse.swt/Eclipse\ SWT/
|
||||||
|
%patch41 -p0
|
||||||
|
popd
|
||||||
|
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/
|
||||||
|
%patch42 -p0
|
||||||
|
popd
|
||||||
|
%patch43
|
||||||
|
pushd plugins/org.eclipse.swt.tools/JNI\ Generation/
|
||||||
|
%patch44
|
||||||
|
popd
|
||||||
|
pushd plugins/org.eclipse.help.webapp
|
||||||
|
%patch45
|
||||||
|
popd
|
||||||
|
|
||||||
# Because the launcher source is zipped up, we need to unzip, patch, and re-pack
|
# Because the launcher source is zipped up, we need to unzip, patch, and re-pack
|
||||||
mkdir launchertmp
|
mkdir launchertmp
|
||||||
@ -421,8 +435,7 @@ ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apac
|
|||||||
ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
|
ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
|
||||||
ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar
|
ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar
|
||||||
#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar
|
#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar
|
||||||
# FIXME: Don't symlink this until we have ant 1.6.5 (rh#162444)
|
ln -sf %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
|
||||||
#ln -sf %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
|
|
||||||
ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
|
ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
|
||||||
ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
|
ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
|
||||||
ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
|
ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
|
||||||
@ -699,7 +712,7 @@ popd
|
|||||||
|
|
||||||
### begin libswt-gtk2 symlinks
|
### begin libswt-gtk2 symlinks
|
||||||
pushd $RPM_BUILD_ROOT%{_libdir}
|
pushd $RPM_BUILD_ROOT%{_libdir}
|
||||||
for base in awt-gtk atk-gtk mozilla-gtk gnome-gtk gtk pi-gtk; do
|
for base in awt-gtk atk-gtk cairo-gtk mozilla-gtk gnome-gtk gtk pi-gtk; do
|
||||||
ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
|
ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
|
||||||
libswt-${base}-%{swt_version}.so
|
libswt-${base}-%{swt_version}.so
|
||||||
done
|
done
|
||||||
@ -763,6 +776,14 @@ id=org.eclipse.platform
|
|||||||
version=%{eclipse_majmin}.%{eclipse_micro}
|
version=%{eclipse_majmin}.%{eclipse_micro}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
# Put Fedora Core version into about.mappings of org.eclipse.sdk to show it in
|
||||||
|
# Eclipse about dialog. (courtesy Debian Eclipse packagers)
|
||||||
|
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_%{eclipse_majmin}.%{eclipse_micro}
|
||||||
|
FEDORA_VERSION=`cat /etc/fedora-release`
|
||||||
|
sed -e "s/\(0=.*\)/\1 ($FEDORA_VERSION)/" < about.mappings > about.mappings.tmp
|
||||||
|
mv about.mappings.tmp about.mappings
|
||||||
|
popd
|
||||||
|
|
||||||
# Create a script that can be used to make a symlink tree of the
|
# Create a script that can be used to make a symlink tree of the
|
||||||
# eclipse platform.
|
# eclipse platform.
|
||||||
cp %{SOURCE16} copy-platform
|
cp %{SOURCE16} copy-platform
|
||||||
@ -787,8 +808,7 @@ ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_*/lib/ant-ap
|
|||||||
ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
|
ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
|
||||||
ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_*/lib/ant-commons-logging.jar
|
ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_*/lib/ant-commons-logging.jar
|
||||||
#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_*/lib/ant-commons-net.jar
|
#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_*/lib/ant-commons-net.jar
|
||||||
# FIXME: Don't symlink this until we have ant 1.6.5 (rh#162444)
|
ln -sf %{_javadir}/ant.jar plugins/org.apache.ant_*/lib/ant.jar
|
||||||
#ln -sf %{_javadir}/ant.jar plugins/org.apache.ant_*/lib/ant.jar
|
|
||||||
ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_*/lib
|
ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_*/lib
|
||||||
ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_*/lib/ant-jdepend.jar
|
ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_*/lib/ant-jdepend.jar
|
||||||
ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_*/lib/ant-jsch.jar
|
ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_*/lib/ant-jsch.jar
|
||||||
@ -1168,9 +1188,6 @@ fi
|
|||||||
%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.db
|
%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.db
|
||||||
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.so
|
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.so
|
||||||
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.db
|
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.db
|
||||||
# These will go away when we get a newer system ant
|
|
||||||
%{_libdir}/gcj/%{name}/ant.jar.db
|
|
||||||
%{_libdir}/gcj/%{name}/ant.jar.so
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files platform-devel
|
%files platform-devel
|
||||||
@ -1179,6 +1196,16 @@ fi
|
|||||||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
|
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 04 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_6fc
|
||||||
|
- Patch org.eclipse.help.webapp jasper classpath.
|
||||||
|
|
||||||
|
* Thu Nov 03 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_5fc
|
||||||
|
- Import work done by Debian Eclipse packagers:
|
||||||
|
- Add Fedora version in Eclipse about dialog.
|
||||||
|
- Update eclipse-javadoc.patch to match Debian's disable-filelog patch.
|
||||||
|
- Remove buildDoc patches and add helpindexbuilder patch (e.o#114001).
|
||||||
|
- Add patches to build Cairo SWT bindings.
|
||||||
|
|
||||||
* Tue Nov 01 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_4fc
|
* Tue Nov 01 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_4fc
|
||||||
- Temporarily exclude ia64 and ppc64 (rh#172174).
|
- Temporarily exclude ia64 and ppc64 (rh#172174).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user