Update to Photon release

This commit is contained in:
Mat Booth 2018-06-12 23:29:21 +01:00
parent be2a7ad2e8
commit c1b9fae7c8
3 changed files with 6 additions and 24 deletions

View File

@ -1,7 +0,0 @@
--- rt.equinox.bundles/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF.bak 2013-03-14 11:36:30.000000000 +0100
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF 2013-04-23 19:28:14.777666704 +0200
@@ -34,3 +34,4 @@
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.equinox.common
+Require-Capability: osgi.identity; filter:="(osgi.identity=org.eclipse.core.runtime)"; resolution:=optional

View File

@ -6,13 +6,9 @@
Epoch: 1
%global eb_commit 81122c55c72d9e308302c878f642f93c39507436
%global eclipse_tag I20180531-0700
%global eclipse_tag I20180611-0500
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
%global _jetty_version 9.4.9
%else
%global _jetty_version 9.4.6
%endif
%global _lucene_version 7.1.0
%ifarch %{ix86}
@ -44,7 +40,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.8.0
Release: 0.8%{?dist}
Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -75,8 +71,6 @@ Patch7: eclipse-secondary-arches.patch
Patch10: eclipse-debug-symbols.patch
Patch11: eclipse-fix-startup-class-refresh.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138
Patch12: eclipse-fix-dropins.patch
@ -181,7 +175,6 @@ BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
BuildRequires: lucene-core >= %{_lucene_version}
BuildRequires: lucene-misc >= %{_lucene_version}
BuildRequires: lucene-analysis >= %{_lucene_version}
BuildRequires: lucene-queryparser >= %{_lucene_version}
BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version}
@ -269,7 +262,6 @@ 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: lucene-core >= %{_lucene_version}
Requires: lucene-misc >= %{_lucene_version}
Requires: lucene-analysis >= %{_lucene_version}
Requires: lucene-queryparser >= %{_lucene_version}
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
@ -301,11 +293,6 @@ Requires: osgi(org.tukaani.xz)
Provides: eclipse-nls = %{version}-%{release}
Obsoletes: eclipse-nls < %{version}-%{release}
# Provides/obsoletes added in F26
# E4 importer functionality was migrated into the core platform
Provides: eclipse-e4-importer = %{version}-%{release}
Obsoletes: eclipse-e4-importer < %{version}-%{release}
%description platform
The Eclipse Platform is the base of all IDE plugins. This does not include the
Java Development Tools or the Plugin Development Environment.
@ -390,7 +377,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
#%patch6
%patch7 -p1
%patch10
%patch11
%patch12
%patch13
%patch14
@ -1090,6 +1076,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
* Tue Jun 12 2018 Mat Booth <mat.booth@redhat.com> - 1:4.8.0-1
- Update to Photon release
* Thu Jun 07 2018 Mat Booth <mat.booth@redhat.com> - 1:4.8.0-0.8
- Update to last RC of Photon

View File

@ -1,2 +1,2 @@
SHA512 (eclipse-platform-sources-I20180531-0700.tar.xz) = a34e3eb772a12d970a1b1bae1d063d337e3a9e581aa2576cd94af0c5563555558e68e395a337f47aefcf8375314be683ac87a270046fd2fc1d9d2cbd712515d5
SHA512 (eclipse-platform-sources-I20180611-0500.tar.xz) = 17f380aa28d51537f83efffb1224d3177426ba4e9a65deb867065a279de382328152159d8a229a993f2dec57405f7fa5f26056ed005798ced2d2385bfc84cf0c
SHA512 (org.eclipse.linuxtools.eclipse-build-81122c55c72d9e308302c878f642f93c39507436.tar.xz) = 170d6801fd2c2f5f95c4d79cb14e36bb5db63142a52cafea81656f63dd132cf1a5b52b945fa0f85d4eed21ed660d22f46d2cdf9cde86e08fed06b16e9a22ed51