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

- Bump mozilla requirement. 

- Use libXtst-devel instead of xorg-x11-devel.
This commit is contained in:
Andrew Overholt 2005-10-31 19:48:52 +00:00
parent 2b55017e95
commit 4ee000640a
2 changed files with 159 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
eclipse-usebuiltlauncher.patch Normal file
View File

@ -0,0 +1,149 @@
--- features/org.eclipse.platform/build.xml 2005-10-28 12:24:11.000000000 -0400
+++ features/org.eclipse.platform/build.xml 2005-10-28 12:25:22.000000000 -0400
@@ -349,6 +349,11 @@
<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml" selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
<antcall target="rootFiles${os}_${ws}_${arch}"/>
</target>
+ <target name="copybuiltlauncher" if="libsconfig">
+ <copy todir="${feature.base}/${os}.${ws}.${arch}/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/../../launchertmp" includes="**" />
+ </copy>
+ </target>
<target name="rootFileswin32_win32_x86">
<mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}"/>
<copy todir="${feature.base}/win32.win32.x86/${collectingFolder}" failonerror="true" overwrite="true">
@@ -357,6 +362,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileslinux_gtk_x86">
@@ -368,6 +375,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" />
</target>
@@ -379,6 +388,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileslinux_gtk_ppc64">
@@ -389,6 +400,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileslinux_gtk_x86_64">
@@ -400,6 +413,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" />
</target>
@@ -411,6 +426,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileslinux_motif_x86">
@@ -424,6 +441,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" />
</target>
@@ -435,6 +454,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilessolaris_gtk_sparc">
@@ -445,6 +466,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilesaix_motif_ppc">
@@ -455,6 +478,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_PA_RISC">
@@ -465,6 +490,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_ia64">
@@ -475,6 +502,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_ia64_32">
@@ -485,6 +514,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilesmacosx_carbon_ppc">
@@ -495,6 +526,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt" />
<exec executable="ln" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" os="Linux">
@@ -511,6 +544,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" />
</target>

14
eclipse.spec
View File

@ -107,6 +107,7 @@ Patch37: %{name}-gre64.conf.patch
Patch38: %{name}-buildDocPlugins.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=111299
Patch39: %{name}-e.o111299.patch
Patch40: %{name}-usebuiltlauncher.patch
%if %{gcj_support}
ExcludeArch: s390 s390x
@ -123,10 +124,10 @@ BuildRequires: glib2-devel
BuildRequires: libgnome-devel
BuildRequires: libgnomeui-devel
BuildRequires: gcc-c++
BuildRequires: mozilla = 37:1.7.11
BuildRequires: mozilla-devel = 37:1.7.11
BuildRequires: mozilla-nspr-devel
BuildRequires: xorg-x11-devel
BuildRequires: mozilla = 37:1.7.12
BuildRequires: mozilla-devel = 37:1.7.12
BuildRequires: nspr-devel
BuildRequires: libXtst-devel
%if %{gcj_support}
BuildRequires: gcc-java >= 4.0.2
BuildRequires: java-gcj-compat-devel >= 1.0.43
@ -367,6 +368,7 @@ popd
pushd plugins
%patch39 -p0
popd
%patch40 -p0
cp %{SOURCE21} .
# Because the launcher source is zipped up, we need to unzip, patch, and re-pack
@ -1177,6 +1179,10 @@ fi
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
%changelog
* Mon Oct 31 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_4fc
- Bump mozilla requirement.
- Use libXtst-devel instead of xorg-x11-devel.
* Thu Oct 27 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_4fc
- Really fix browser issue on x86_64 (rh#168040).
- Attempt to build on ia64 and ppc64 (include swt-mozilla on the latter).