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

Replaced geronimo with glassfish as the javax.annotation provider

Browse Source
This commit is contained in:
Sopot Cela 2015-07-15 13:27:38 +02:00
parent a3ce5dae3f
commit 2970ae9d51
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eclipse-feature-plugins-to-category-ius.patch
View File

@ -354,7 +354,7 @@ index 8176831..c97bab0 100644
+ <import plugin="org.apache.felix.gogo.command" />
+ <import plugin="org.apache.felix.gogo.runtime" />
+ <import plugin="org.apache.felix.gogo.shell" />
+ <import plugin="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
+ <import plugin="javax.annotation-api" />
+ <import plugin="org.w3c.dom.svg" />
+ <import plugin="org.w3c.css.sac" />
+ <import plugin="javax.inject" />
@ -404,7 +404,7 @@ index 6f6526b..c05d703 100644
+ <bundle id="org.apache.felix.gogo.command" />
+ <bundle id="org.apache.felix.gogo.runtime" />
+ <bundle id="org.apache.felix.gogo.shell" />
+ <bundle id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
+ <bundle id="javax.annotation-api" />
+ <bundle id="org.w3c.dom.svg" />
+ <bundle id="org.w3c.css.sac" />
+ <bundle id="javax.inject" />

2
eclipse-remove-w3c-smil-and-use-geronimo.patch → eclipse-remove-w3c-smil-and-use-glassfish.patch
View File

@ -5,7 +5,7 @@
<requirement>
<type>eclipse-plugin</type>
- <id>javax.annotation</id>
+ <id>org.apache.geronimo.specs.geronimo-annotation_1.1_spec</id>
+ <id>javax.annotation-api</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>

17
eclipse.spec
View File

@ -11,7 +11,7 @@ Epoch: 1
%global eclipse_major 4
%global eclipse_minor 5
%global eclipse_micro 0
%global eb_commit da55ff01f3de743f70197a9addb386a6d2183b60
%global eb_commit 27693f414e65ae520724dca2fa5c682fa3256d29
%global eclipse_tag R4_5
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
%global _jetty_version 9.3.0
@ -37,7 +37,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 4%{?dist}
Release: 5%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -45,7 +45,7 @@ URL: http://www.eclipse.org/
Source0: R4_platform-aggregator-%{eclipse_tag}.tar.xz
Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz
Patch0: %{pkg_name}-remove-w3c-smil-and-use-geronimo.patch
Patch0: %{pkg_name}-remove-w3c-smil-and-use-glassfish.patch
# Eclipse should not include source for dependencies that are not supplied by this package
# and should not include source for bundles that are not relevant to our platform
@ -109,7 +109,7 @@ Patch19: %{pkg_name}-support-symlink-bundles.patch
# -org.apache.jasper.glassfish
# +org.glassfish.web.javax.servlet.jsp
# -javax.annotation
# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec
# +javax.annotation-api
# -org.w3c.dom.smil
Patch20: %{pkg_name}-feature-plugins-to-category-ius.patch
Patch21: disable-non-linux.patch
@ -145,7 +145,6 @@ BuildRequires: gtk2-devel
BuildRequires: webkitgtk-devel
%endif
%endif
BuildRequires: geronimo-annotation >= 1.0-7
BuildRequires: icu4j >= 1:54.1.1-2
BuildRequires: 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
BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
@ -191,6 +190,7 @@ BuildRequires: httpcomponents-client >= 4.4.1-1
BuildRequires: xz-java
BuildRequires: mockito
BuildRequires: osgi(osgi.annotation)
BuildRequires: glassfish-annotation-api
%if ! %{bootstrap}
# Build deps that are excluded when bootstrapping
BuildRequires: eclipse-pde
@ -252,6 +252,7 @@ Requires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
Requires: osgi(javax.annotation-api)
Requires: jsch >= 0.1.46-2
Requires: lucene-core >= 4.10.2
Requires: lucene-analysis >= 4.10.2
@ -260,7 +261,6 @@ Requires: sac >= 1.3-12
Requires: batik-css >= 1.8-0.17
Requires: xml-commons-apis >= 1.4.01-12
Requires: atinject >= 1-18
Requires: geronimo-annotation >= 1.0-7
Requires: eclipse-ecf-core >= 3.10.0-1
Requires: eclipse-emf-core >= 2.11.0-2
Requires: glassfish-jsp-api >= 2.2.1-4
@ -904,7 +904,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.command_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.runtime_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.shell_*
%{_libdir}/%{pkg_name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*
%{_libdir}/%{pkg_name}/plugins/javax.annotation-api_*
%{_libdir}/%{pkg_name}/plugins/org.glassfish.web.javax.servlet.jsp_*
%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.*
%{_libdir}/%{pkg_name}/plugins/org.apache.xalan_*
@ -1096,6 +1096,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Wed Jul 15 2015 Sopot Cela <scela@redhat.com> 1:4.5.0-5
- Replaced javax.annotation provider from geronimo to glassfish
* Tue Jul 7 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-4
- Add Maven metadata for SWT

BIN
org.eclipse.linuxtools.eclipse-build-27693f414e65ae520724dca2fa5c682fa3256d29.tar.xz Normal file
View File

Binary file not shown.