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

Remove more non-linux bundles from features 

- Avoid incorrect servlet-api when building on F22
- Add recommends on e4-importer
This commit is contained in:
Mat Booth 2015-06-10 17:44:38 +01:00
parent 39f36cc25b
commit 910583eed2
2 changed files with 162 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
disable-non-linux.patch
View File

@ -80,3 +80,152 @@
id="org.eclipse.equinox.common"
download-size="0"
install-size="0"
--- eclipse.platform.releng/features/org.eclipse.rcp/feature.xml.orig 2015-06-10 15:06:20.097805994 +0100
+++ eclipse.platform.releng/features/org.eclipse.rcp/feature.xml 2015-06-10 15:06:25.923729658 +0100
@@ -59,14 +59,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.ui.cocoa"
- os="macosx"
- ws="cocoa"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
</feature>
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.orig 2015-06-02 10:18:54.000000000 +0100
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2015-06-10 16:36:59.459534609 +0100
@@ -67,14 +67,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.compare.win32"
- os="win32"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.core.filebuffers"
download-size="0"
install-size="0"
@@ -365,35 +357,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ui.win32"
- ws="win32"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.filesystem.aix.ppc"
- os="aix"
- arch="ppc"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.filesystem.aix.ppc64"
- os="aix"
- arch="ppc64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
id="org.eclipse.core.filesystem.hpux.ia64"
os="hpux"
arch="ia64"
@@ -453,26 +416,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.core.resources.win32.x86"
- os="win32"
- arch="x86"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.resources.win32.x86_64"
- os="win32"
- arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
id="org.eclipse.core.filesystem.win32.x86_64"
os="win32"
arch="x86_64"
@@ -548,35 +491,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.equinox.security.win32.x86"
- os="win32"
- arch="x86"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.security.win32.x86_64"
- os="win32"
- arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.security.macosx"
- os="macosx"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
id="org.eclipse.core.externaltools"
download-size="0"
install-size="0"
--- eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml.orig 2015-06-10 17:41:42.262002217 +0100
+++ eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml 2015-06-10 17:41:55.679822949 +0100
@@ -132,13 +132,6 @@
version="0.0.0"/>
<plugin
- id="org.eclipse.swt.examples.ole.win32"
- ws="win32"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.eclipse.sdk.examples"
download-size="0"
install-size="0"

20
eclipse.spec
View File

@ -274,6 +274,7 @@ Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
Requires: objectweb-asm >= 5.0.3-1
Recommends: eclipse-e4-importer
# For PDE Build wrapper script + creating jars
Requires: zip
Requires: bash
@ -412,22 +413,26 @@ for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.laun
fi
fi
done
for b in `ls eclipse.platform.team/bundles/org.eclipse.core.net/fragments/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{eclipse_arch}$)'` ; do
%pom_disable_module bundles/org.eclipse.core.net/fragments/$b eclipse.platform.team
%pom_xpath_remove "plugin[@id='$b']" eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
done
for b in `ls eclipse.platform.resources/bundles/ | grep -P -e 'org.eclipse.core.filesystem\.(?!linux\.%{eclipse_arch}$|java7$)'` ; do
module=$(grep ">bundles/$b<" eclipse.platform.resources/pom.xml || :)
if [ -n "$module" ] ; then
%pom_disable_module bundles/$b eclipse.platform.resources
%pom_xpath_remove "plugin[@id='$b']" eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
fi
done
%pom_disable_module org.eclipse.jdt.launching.macosx eclipse.jdt.debug
%pom_disable_module org.eclipse.jdt.launching.ui.macosx eclipse.jdt.debug
%pom_disable_module bundles/org.eclipse.equinox.security.macosx rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.security.win32.x86 rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.security.win32.x86_64 rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.compare.win32 eclipse.platform.team
%pom_disable_module bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86 eclipse.platform.team
%pom_disable_module bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64 eclipse.platform.team
%pom_disable_module bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa eclipse.platform.ui
%pom_disable_module bundles/org.eclipse.ui.cocoa eclipse.platform.ui
%pom_disable_module bundles/org.eclipse.ui.win32 eclipse.platform.ui
%pom_disable_module bundles/org.eclipse.core.filesystem.hpux.ia64 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem.macosx eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem.solaris.sparc eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem.win32.x86 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem.win32.x86_64 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86 eclipse.platform.resources
@ -1058,6 +1063,7 @@ fi
* Wed Jun 10 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.26.git201506012000
- Add patch for stricter feature packaging.
- Avoid incorrect servlet-api when building on F22
- Add recommends on e4-importer
* Thu Jun 04 2015 Michael Simacek <msimacek@redhat.com> - 1:4.5.0-0.25.git201506012000
- Rebuild after ecf rebuild