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

- Import 3.1 RC4. 

- Remove activeHelpSample.jar building patch as it's now fixed upstream.
- Add patch to remove references to cairo since we don't have it in FC4.
- Add about.html and about_files to eclipse-platform.install.
- Add patch to create public compare API (jpound - e.o#98707).
- Add patch from Robin Green to not look for firefox libxpcom.so
    (rh#161658).
- Symlink lucene jars (rh#159939).
This commit is contained in:
Andrew Overholt 2005-06-27 19:38:29 +00:00
parent e1908be23b
commit 1e7b77f704
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
eclipse.spec
View File

@ -12,7 +12,7 @@ Epoch: 1
%define eclipse_micro 0
%define eclipse_oldmajminmic 3.0.0
%define libname libswt3
%define build_id S-3.1RC3-200506171618
%define build_id S-3.1RC4-200506241300
# 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.RC3.3
Release: 0.RC4.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.1RC3-200506171618/eclipse-sourceBuild-srcIncluded-3.1RC3.zip
Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1RC4-200506241300/eclipse-sourceBuild-srcIncluded-3.1RC4.zip
Source1: %{name}.script
Source2: %{name}.desktop
Source5: %{name}-48.png
@ -68,8 +68,6 @@ Patch11: %{name}-libswt-mozilla.patch
#Patch13: %{name}-s390ands390x.patch
# Stupid spaces in directories ...
#Patch14: %{name}-s390ands390x2.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=82916
Patch15: %{name}-build-activeHelpSample.jar.patch
# Make find work. See
# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736
#Patch16: %{name}-find.patch
@ -94,6 +92,10 @@ Patch28: %{name}-tomcat5.patch
Patch29: %{name}-tomcat5-build.patch
Patch30: %{name}-tomcat5-build.2.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
Patch33: %{name}-compare-create-api.patch
%if %{gcj_support}
ExclusiveArch: %{ix86} x86_64 ppc
@ -127,7 +129,7 @@ BuildRequires: jsch >= 0:0.1.18-1jpp
BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
BuildRequires: mx4j >= 2.1
BuildRequires: tomcat5 tomcat5-jasper tomcat5-servlet-2.4-api
#BuildRequires: lucene lucene-demo
BuildRequires: lucene lucene-demo
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
%if %{gcj_support}
@ -185,7 +187,7 @@ Requires: jsch >= 0:0.1.18-1jpp
Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
Requires: mx4j >= 2.1
Requires: tomcat5 tomcat5-jasper tomcat5-servlet-2.4-api
#Requires: lucene lucene-demo
Requires: lucene lucene-demo
Requires: regexp
%description platform
@ -297,10 +299,6 @@ popd
%if %{gcj_support}
#%patch13 -p1
%endif
pushd plugins/org.eclipse.platform.doc.isv
rm -f activeHelpSample.jar
%patch15 -p0
popd
%if %{gcj_support}
#%patch16 -p0
%endif
@ -328,6 +326,20 @@ popd
pushd plugins/org.eclipse.help.webapp
%patch31 -p0
popd
# Remove the pre-built cairo libraries
pushd plugins/org.eclipse.swt.gtk.linux.x86
rm libcairo.so.1
popd
pushd plugins/org.eclipse.swt.gtk.linux.x86_64
rm libcairo.so.1
popd
pushd plugins/org.eclipse.swt.motif.linux.x86
rm libcairo.so.1
popd
%patch32 -p0
pushd plugins/org.eclipse.compare
%patch32 -p0
popd
%if %{gcj_support}
# Fedora splash screen.
@ -403,11 +415,11 @@ ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
##ln -sf %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant/lib/ant-xslp.jar
# ------------------------------------------------------------------------
## END ANT ##
## BEGIN LUCENE ##
#ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
#ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene/parser.jar
## END LUCENE ##
# =====>>>>>>>>>>>ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
# BEGIN LUCENE ##
ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene/parser.jar
# END LUCENE ##
ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
# ------------------------------------------------------------------------
## BEGIN TOMCAT ##
rm -f plugins/org.eclipse.tomcat/commons-beanutils.jar
@ -715,7 +727,7 @@ for l in `find configuration -name \*.so`; do
# Add this directory to the files list for eclipse-platform
# This topmostDirs hack is needed due to differences in directory
# layout between the build system and regular machines
topmostDirss=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
topmostDirs=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
if [ "$topmostDirs" = "var-tmp" ]; then
echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11"/"$12 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
else
@ -729,7 +741,7 @@ for l in `find configuration -name \*.so`; do
# Add this directory to the files list for eclipse-platform
# This topmostDirs hack is needed due to differences in directory
# layout between the build system and regular machines
topmostDirss=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
topmostDirs=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
if [ "$topmostDirs" = "var-tmp" ]; then
echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11"/"$12 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
else
@ -852,8 +864,8 @@ ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_*/lib/ant-trax.jar
#ln -sf %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant_*/lib/ant-xalan1.jar
#ln -sf %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant_*/lib/ant-xslp.jar
## END ANT ##
#ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
#ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene_*/parser.jar
ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene_*/parser.jar
# plugins/org.eclipse.core.boot_*/boot.jar
###ln -sf %{_javadir}/ant.jar plugins/org.eclipse.core.resources_*/lib/ant.jar
# plugins/org.eclipse.core.resources_*/lib/antsupport.jar
@ -865,7 +877,7 @@ ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_*/lib/ant-trax.jar
###ln -sf %{_javadir}/xml-commons-apis.jar plugins/org.eclipse.osgi_*/osgi/xmlParserAPIs.jar
# plugins/org.eclipse.osgi.services_*/services.jar
# plugins/org.eclipse.osgi.util_*/util.jar
#===> ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
# plugins/org.eclipse.text/text_*.jar
## BEGIN TOMCAT ##
rm -f plugins/org.eclipse.tomcat_*/commons-beanutils.jar
@ -1228,6 +1240,15 @@ fi
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
* Sun Jun 26 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC4.1
- Import 3.1 RC4.
- Remove activeHelpSample.jar building patch as it's now fixed upstream.
- Add patch to remove references to cairo since we don't have it in FC4.
- Add about.html and about_files to eclipse-platform.install.
- Add patch to create public compare API (jpound - e.o#98707).
- Add patch from Robin Green to not look for firefox libxpcom.so (rh#161658).
- Symlink lucene jars (rh#159939).
* Fri Jun 24 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC3.3
- Add rcp requirement for platform (rh#161267).
- Add un-owned osgi directories to libswt and platform.

2
sources
View File

@ -1,3 +1,3 @@
a51cad364164de7c3cd65bf48037a8f9 eclipse-native-splash-3.1-M7.png
60f8146948470d0ef7c275f26b874a31 ecj-M5.zip
f395b390ee65e0afcd7d5615eb2ad5f4 eclipse-sourceBuild-srcIncluded-3.1RC3.zip
a3e4871646cabf87948ea0f6225d6e49 eclipse-sourceBuild-srcIncluded-3.1RC4.zip