Attachment 348294 Details for Bug 488352 – eclipse.spec.patch

[patch] eclipse.spec.patch

eclipse.spec.patch (text/plain), 6.90 KB, created by Alphonse Van Assche on 2009-06-17 16:47:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alphonse Van Assche

Created: 2009-06-17 16:47:52 UTC

Size: 6.90 KB

patch

obsolete

>diff -u -b -B -r1.642 eclipse.spec
>--- eclipse.spec	20 May 2009 19:43:47 -0000	1.642
>+++ eclipse.spec	17 Jun 2009 15:40:17 -0000
>@@ -1,3 +1,7 @@
>+%define _use_internal_dependency_generator 0
>+%define __find_provides /usr/lib/rpm/osgideps.pl -p  
>+%define __find_requires /usr/lib/rpm/osgideps.pl -r  
>+
> # TODO:
> # - look at startup script and launcher patches
> # - get Ganymede update site pre-configured (https://bugs.eclipse.org/249133)
>@@ -223,7 +227,7 @@
> # FIXME:  investigate.  Can we just add a %{arch} to the above?
> ## This file-level requirement is for the bi-arch multilib case
> #Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
>-Requires:       icu4j-eclipse >= 4.0.1
>+#Requires:       icu4j-eclipse >= 4.0.1
> Requires:       java >= 1.6.0
> 
> %description    rcp
>@@ -236,20 +240,20 @@
> # FIXME:  investigate.  Can we just add a %{arch} to the above?
> ## This file-level requirement is for the bi-arch multilib case
> #Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
>-Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
>-Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
>-Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
>-Requires: jakarta-commons-el >= 1.0-9
>-Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
>-Requires: mx4j >= 2.1
>-Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
>-Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
>-Requires: jetty >= 5.1.14-1.6
>-Requires: jsch >= 0.1.41
>-Requires: lucene >= 2.3.1-3.4
>-Requires: lucene-contrib >= 2.3.1-3.4
>-Requires: regexp
>-Requires: sat4j >= 2.1.0
>+#Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
>+#Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
>+#Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
>+#Requires: jakarta-commons-el >= 1.0-9
>+#Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
>+#Requires: mx4j >= 2.1
>+#Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
>+#Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
>+#Requires: jetty >= 5.1.14-1.6
>+#Requires: jsch >= 0.1.41
>+#Requires: lucene >= 2.3.1-3.4
>+#Requires: lucene-contrib >= 2.3.1-3.4
>+#Requires: regexp
>+#Requires: sat4j >= 2.1.0
> Provides: eclipse-cvs-client = 1:%{version}-%{release}
> Obsoletes: eclipse-cvs-client < 1:3.3.2-20
> 
>@@ -262,10 +266,10 @@
> Group:          Text Editors/Integrated Development Environments (IDE)
> Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
> Requires:       %{name}-cvs-client = %{epoch}:%{version}-%{release}
>-Requires:       junit >= 3.8.1-3jpp
>-Requires:       junit4
>-Requires:       jakarta-commons-codec
>-Requires:       jakarta-commons-httpclient
>+#Requires:       junit >= 3.8.1-3jpp
>+#Requires:       junit4
>+#Requires:       jakarta-commons-codec
>+#Requires:       jakarta-commons-httpclient
> Requires:       java-javadoc
> Requires:       java-devel
> 
>@@ -280,7 +284,7 @@
> Provides:	eclipse-sdk
> Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
> Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
>-Requires:       objectweb-asm
>+#Requires:       objectweb-asm
> # For PDE Build wrapper script
> Requires:       bash
> Provides:       %{name}-pde-runtime = 1:%{version}-%{release}
>@@ -1404,6 +1409,18 @@
> %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
> %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
> %{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
>+%{_libdir}/%{name}/plugins/javax.servlet_*
>+%{_libdir}/%{name}/plugins/javax.servlet.jsp_*
>+%{_libdir}/%{name}/plugins/org.eclipse.core.resources_*
>+%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
>+%{_libdir}/%{name}/plugins/org.eclipse.text_*
>+%{_libdir}/%{name}/plugins/org.eclipse.team.core_*
>+%{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
>+%{_libdir}/%{name}/plugins/org.eclipse.core.variables_*
>+%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*
>+%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_*
>+%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
> 
> %if %{initialize}
> %files platform -f %{name}-platform.install
>@@ -1423,30 +1440,22 @@
> %dir %{_datadir}/%{name}/dropins
> %{_libdir}/%{name}/features/org.eclipse.platform_*
> %{_libdir}/%{name}/plugins/com.jcraft.jsch_*
>-%{_libdir}/%{name}/plugins/javax.servlet_*
>-%{_libdir}/%{name}/plugins/javax.servlet.jsp_*
> %{_libdir}/%{name}/plugins/org.apache.ant_*
> %{_libdir}/%{name}/plugins/org.apache.commons.el_*
> %{_libdir}/%{name}/plugins/org.apache.commons.logging_*
> %{_libdir}/%{name}/plugins/org.apache.lucene_*
> %{_libdir}/%{name}/plugins/org.apache.lucene.analysis_*
>-%{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
> %{_libdir}/%{name}/plugins/org.eclipse.compare_*
> %{_libdir}/%{name}/plugins/org.eclipse.compare.core_*
> %{_libdir}/%{name}/plugins/org.eclipse.core.boot_*
> %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*
>-%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_*
>-%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
> %{_libdir}/%{name}/plugins/org.eclipse.core.net_*
> %ifarch %{ix86}
> %{_libdir}/%{name}/plugins/org.eclipse.core.net.linux.x86_*
> %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*
> %endif
>-%{_libdir}/%{name}/plugins/org.eclipse.core.resources_*
>-%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
> %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
> %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
>-%{_libdir}/%{name}/plugins/org.eclipse.core.variables_*
> %{_libdir}/%{name}/plugins/org.eclipse.debug.core_*
> %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*
> %{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*
>@@ -1463,14 +1472,11 @@
> %{_libdir}/%{name}/plugins/org.eclipse.jsch.ui_*
> %{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*
> %{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
>-%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*
> %{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*
> %{_libdir}/%{name}/plugins/org.eclipse.platform_*
> %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*
> %{_libdir}/%{name}/plugins/org.eclipse.search_*
>-%{_libdir}/%{name}/plugins/org.eclipse.team.core_*
> %{_libdir}/%{name}/plugins/org.eclipse.team.ui_*
>-%{_libdir}/%{name}/plugins/org.eclipse.text_*
> %{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*
> %{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
> %{_libdir}/%{name}/plugins/org.eclipse.ui.console_*

Actions: View | Diff

Attachments on bug 488352: 333928 | 334177 | 348294 | 376601 | 376602 | 376603 | 376604 | 376605 | 376606 | 376607 | 376608 | 376609 | 376610 | 376611 | 376612 | 376613 | 376614 | 376615