Architecture specific change in rpms/cryptobone.git
by githook-noreply@fedoraproject.org
The package rpms/cryptobone.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cryptobone.git/commit/?id=c6fc956....
Change:
+ExclusiveArch: x86_64 %{ix86}
Thanks.
Full change:
============
commit c6fc956a784a505068f48213ecefe1a4f1c48444
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 15:07:47 2017 +0200
update to aarch64
diff --git a/cryptobone.spec b/cryptobone.spec
index eb1bb9b..6146edb 100644
--- a/cryptobone.spec
+++ b/cryptobone.spec
@@ -14,7 +14,8 @@ Source1: https://crypto-bone.com/release/source/cryptobone-%{version}-%{relea
Source2: gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc
Source3: COPYING
-ExclusiveArch: x86_64 %{ix86} aarch64
+ExclusiveArch: x86_64 %{ix86}
+# no aarch64 yet, bignum code does not compile
BuildRequires: libbsd-devel
BuildRequires: gcc
@@ -183,7 +184,7 @@ fi
%changelog
* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 1.1.1-6
-- update aarch64
+- exclude aarch64
* Sun Feb 19 2017 Senderek Web Security <innovation(a)senderek.ie> - 1.1.1-5
- mandatory rebuild, no changes
diff --git a/sources b/sources
index 35e2d08..427576a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (cryptobone-1.1.1-6.fc27.tar.gz) = d01668fc789412e62a27a1b113c32f3f9b4a3d271e63baa4b1749e47033ebfb945f7f0cb9d2c29846f69af66313c2e07a83934c903432289641ccb1315a8adc5
SHA512 (cryptobone-1.1.1-6.fc27.tar.gz.asc) = 9c43e85b2034979ef7000ffe4e4e80bca94640e9a3b9030b65bb73dda82dd01ae8c6a9a84315ec3b61522e6005ed152d545c058a904f2b9a4afe4f3504277ffd
-SHA512 (cryptobone.spec) = c18a9ab5ed29248778d5c3cb3eb4e9022d672724018b52c705380ca0c9334a0d18ae1b654873b498c32996b81ee66a5c8e511cb7aefbab2086624613e292ed95
+SHA512 (cryptobone.spec) = 0e321a4d25b48cbe3d16f785acebf6920025765c9021d1e1358b52e2a068c2da99f0ca740a0926953553cc4302794a1f9abb84fc1f0aba9d33d4ff2873e00b89
6 years, 9 months
Architecture specific change in rpms/cryptobone.git
by githook-noreply@fedoraproject.org
The package rpms/cryptobone.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cryptobone.git/commit/?id=d467793....
Change:
+ExclusiveArch: x86_64 %{ix86} aarch64
Thanks.
Full change:
============
commit d4677938b129b15ff58ea7b43908f3bb3ea87e0a
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 14:14:16 2017 +0200
update to aarch64
diff --git a/cryptobone.spec b/cryptobone.spec
index 5197a61..eb1bb9b 100644
--- a/cryptobone.spec
+++ b/cryptobone.spec
@@ -3,7 +3,7 @@
Name: cryptobone
Version: 1.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Secure Communication Under Your Control
Group: Applications/Internet
@@ -14,7 +14,7 @@ Source1: https://crypto-bone.com/release/source/cryptobone-%{version}-%{relea
Source2: gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc
Source3: COPYING
-ExclusiveArch: x86_64 %{ix86} %{arm}
+ExclusiveArch: x86_64 %{ix86} aarch64
BuildRequires: libbsd-devel
BuildRequires: gcc
@@ -182,6 +182,8 @@ fi
%doc %{_docdir}/%{name}/README-cryptlib
%changelog
+* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 1.1.1-6
+- update aarch64
* Sun Feb 19 2017 Senderek Web Security <innovation(a)senderek.ie> - 1.1.1-5
- mandatory rebuild, no changes
@@ -190,7 +192,7 @@ fi
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Jan 31 2017 Senderek Web Security <innovation(a)senderek.ie> - 1.1.1-3
- compile with gcc-7.0 and -march=native
+- compile with gcc-7.0 and -march=native
* Tue Dec 13 2016 Senderek Web Security <innovation(a)senderek.ie> - 1.1.1-2
- compile initdatabase.c with PIE
diff --git a/sources b/sources
index fffb594..d3e2ffa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (cryptobone-1.1.1-5.fc26.tar.gz) = d01668fc789412e62a27a1b113c32f3f9b4a3d271e63baa4b1749e47033ebfb945f7f0cb9d2c29846f69af66313c2e07a83934c903432289641ccb1315a8adc5
SHA512 (cryptobone-1.1.1-5.fc26.tar.gz.asc) = 9c43e85b2034979ef7000ffe4e4e80bca94640e9a3b9030b65bb73dda82dd01ae8c6a9a84315ec3b61522e6005ed152d545c058a904f2b9a4afe4f3504277ffd
-SHA512 (cryptobone.spec) = 89d8d6f233d7b2a1fc72400f603fb5f8cb98e3e9f33414839f0d148531cd527038613837dc4a1688752dd4354439cbee98056c8e5258f04767064fd1f7b56322
+SHA512 (cryptobone.spec) = c18a9ab5ed29248778d5c3cb3eb4e9022d672724018b52c705380ca0c9334a0d18ae1b654873b498c32996b81ee66a5c8e511cb7aefbab2086624613e292ed95
6 years, 9 months
Architecture specific change in rpms/golang-github-cznic-zappy.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-cznic-zappy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-cznic-zappy.git/com....
Change:
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a06c9a292116765f9eca8f64b5637c9e1bebdb01
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Jul 5 13:28:24 2017 +0200
Initial import (#1431743).
diff --git a/.gitignore b/.gitignore
index e69de29..50568ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/cznic-zappy-2533cb5.tar.gz
diff --git a/golang-github-cznic-zappy.spec b/golang-github-cznic-zappy.spec
new file mode 100644
index 0000000..b7f3c0f
--- /dev/null
+++ b/golang-github-cznic-zappy.spec
@@ -0,0 +1,181 @@
+# Generate devel rpm
+%global with_devel 1
+# Build project from bundled dependencies
+%global with_bundled 0
+# Build with debug info rpm
+%global with_debug 0
+
+# Tests need to download test data during execution of "go test",
+# so they have to be disabled for package builds.
+# Also, since the source directory isn't writable when installed,
+# a unit tests package makes no sense because "go test" can't
+# download the test data to the location where the tests expects it.
+
+# Run tests in check section
+%global with_check 0
+# Generate unit-test rpm
+%global with_unit_test 0
+
+%if 0%{?with_debug}
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package %{nil}
+%endif
+
+%global provider github
+%global provider_tld com
+%global project cznic
+%global repo zappy
+# https://github.com/cznic/zappy
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider_prefix}
+%global commit 2533cb5b45cc6c07421468ce262899ddc9d53fb7
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20160723
+
+
+Name: golang-%{provider}-%{project}-%{repo}
+Version: 0
+Release: 0.1.%{commitdate}.git%{shortcommit}%{?dist}
+Summary: Block-based compression format implementation in Go
+License: BSD
+URL: https://%{provider_prefix}
+Source0: https://%{provider_prefix}/archive/%{commit}/cznic-%{repo}-%{shortcommit}.tar.gz
+
+# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
+# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
+BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+
+%description
+%{summary}
+
+
+%if 0%{?with_devel}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%if 0%{?with_check} && ! 0%{?with_bundled}
+BuildRequires: golang(github.com/cznic/internal/buffer)
+%endif
+
+Requires: golang(github.com/cznic/internal/buffer)
+
+Provides: golang(%{import_path}) = %{version}-%{release}
+
+%description devel
+%{summary}
+
+This package contains library source intended for
+building other packages which use import path with
+%{import_path} prefix.
+%endif
+
+
+%if 0%{?with_unit_test} && 0%{?with_devel}
+%package unit-test-devel
+Summary: Unit tests for %{name} package
+
+# test subpackage tests code from devel subpackage
+Requires: %{name}-devel = %{version}-%{release}
+
+%if 0%{?with_check} && ! 0%{?with_bundled}
+BuildRequires: golang(github.com/golang/snappy)
+%endif
+
+Requires: golang(github.com/golang/snappy)
+
+%description unit-test-devel
+%{summary}
+
+This package contains unit tests for project
+providing packages with %{import_path} prefix.
+%endif
+
+
+%prep
+%setup -q -n %{repo}-%{commit}
+
+
+%build
+
+
+%install
+# source codes for building projects
+%if 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
+
+# find all *.go but no *_test.go files and generate devel.file-list
+for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
+ dirprefix=$(dirname $file)
+ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
+ cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+ echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
+
+ while [ "$dirprefix" != "." ]; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+ dirprefix=$(dirname $dirprefix)
+ done
+done
+%endif
+
+# testing files for this project
+%if 0%{?with_unit_test} && 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+
+# find all *_test.go files and generate unit-test-devel.file-list
+for file in $(find . -iname "*_test.go") ; do
+ dirprefix=$(dirname $file)
+ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
+ cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+ echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
+
+ while [ "$dirprefix" != "." ]; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+ dirprefix=$(dirname $dirprefix)
+ done
+done
+%endif
+
+%if 0%{?with_devel}
+sort -u -o devel.file-list devel.file-list
+%endif
+
+
+%check
+%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+
+%if ! 0%{?gotest:1}
+%global gotest go test
+%endif
+
+%gotest %{import_path}
+%endif
+
+
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
+
+%if 0%{?with_devel}
+%files devel -f devel.file-list
+%license LICENSE SNAPPY-GO-LICENSE
+%doc CONTRIBUTORS README.md AUTHORS
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%endif
+
+
+%if 0%{?with_unit_test} && 0%{?with_devel}
+%files unit-test-devel -f unit-test-devel.file-list
+%license LICENSE SNAPPY-GO-LICENSE
+%doc CONTRIBUTORS README.md AUTHORS
+%endif
+
+
+%changelog
+* Sat Mar 11 2017 Fabio Valentini <decathorpe(a)gmail.com> - 0-0.1.20160723.git2533cb5
+- First package for Fedora
+
diff --git a/sources b/sources
index e69de29..fd38c44 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (cznic-zappy-2533cb5.tar.gz) = 70735904452e11146fca05340e4139cb03554701d2f502741aa9147ec7d0b3c5eb6bdfd2763b9ea97d04362430241ae81e278d3b84f62fa5732365ca3e25dc18
6 years, 9 months
Architecture specific change in rpms/cryptlib.git
by githook-noreply@fedoraproject.org
The package rpms/cryptlib.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cryptlib.git/commit/?id=6b42235f4...
https://src.fedoraproject.org/cgit/rpms/cryptlib.git/commit/?id=9a9b9d15a....
Change:
+ExclusiveArch: x86_64 %{ix86} aarch64
+ExclusiveArch: x86_64 %{ix86} aarch64 ppc64
Thanks.
Full change:
============
commit 56d2632137ccc4a5d41b4a0558125d244d03b6f3
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 13:36:12 2017 +0200
add aarch64 and exclude ppc64 3.4.3.1-3
diff --git a/cryptlib.spec b/cryptlib.spec
index 6a6bb42..9f8cc56 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -331,6 +331,9 @@ tar xpzf %{SOURCE4}
* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-3
- include aarch64 and exclude ppc64
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 3.4.3.1-2
+- Perl 5.26 rebuild
+
* Sat Feb 11 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-1
- update to version 3.4.3.1
diff --git a/sources b/sources
index 779b09b..6140af3 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,6 @@
-SHA512 (cryptlib.spec) = 6ca32dabe50116dc8cba07588ccfad4efa45145d69d22ea8e49adcd4836dfed43983bde25650eba592cc25ebd69914dd70a5dafa59484f2b1e687ee376152811
+SHA512 (cryptlib.spec) = 4b8888e3a0cee643ae3890cdd74f0239d3fc0c1d4160c4b4fa9c01bf24b2c288b801f2a66eda2f3650c79a39d9b523a40a44c1ce5c4f89dcab55a46fc1ac99fd
SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4
SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9
-SHA512 (gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc) = afef09564e699b86bf2cbd59ccdb89f50574e49dea41534eaef40f50971b2f5db0ae9578da97cd5dd9fbbc37041247ab167157ee567b68bf9fb4ce85f2c3d8d2
SHA512 (README-manual) = ee6f1fe26828fd53d502218eddb0d292f9a99eec18a1bfdbc8ac29e15de597f1382c83f6e85ee3dcc236b1717e29c241e6405d9378ca4ae2e88fe3918a667a3a
SHA512 (cryptlib-tests.tar.gz) = 83bc6061f0b76e5e46100a21965b8362ab1a2c1c4fcb8bcd7b87971f9f4fd59861685b47d72394f40295076f2b2d7993223c535ed21c8ea352551b65f71e1801
SHA512 (cryptlib-perlfiles.tar.gz) = b975d34acfd1d99a224bbd5536483e5489feac8801a567740ec668bcef9a1eff67fddbdad53f61b2ff48bd43396e92f070ebf4de622f3edeb70428f4aaae2ff6
commit cf61775a0786b9c0a259ce47871e5512129bd1a8
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 12:38:50 2017 +0200
add aarch64 and exclude ppc64
diff --git a/cryptlib.spec b/cryptlib.spec
index 861fe7b..6a6bb42 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -6,7 +6,7 @@
Name: cryptlib
Version: 3.4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Security library and toolkit for encryption and authentication services
Group: System Environment/Libraries
@@ -328,7 +328,7 @@ tar xpzf %{SOURCE4}
%changelog
-* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-2
+* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-3
- include aarch64 and exclude ppc64
* Sat Feb 11 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-1
diff --git a/sources b/sources
index beb9ee8..779b09b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cryptlib.spec) = 3e1743b22f7bb0209e3abed1e6551a501b7e1d808b1aedd6bf8251649ce631c8a5951008676f3f7b3324b0a03ec6785a046cd6f1559ad4a3ed316f5dc625b818
+SHA512 (cryptlib.spec) = 6ca32dabe50116dc8cba07588ccfad4efa45145d69d22ea8e49adcd4836dfed43983bde25650eba592cc25ebd69914dd70a5dafa59484f2b1e687ee376152811
SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4
SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9
SHA512 (gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc) = afef09564e699b86bf2cbd59ccdb89f50574e49dea41534eaef40f50971b2f5db0ae9578da97cd5dd9fbbc37041247ab167157ee567b68bf9fb4ce85f2c3d8d2
commit 83a7d0638112044f38847f7fcfc6daecc95a0f06
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 12:31:22 2017 +0200
add aarch64 and exclude ppc64
diff --git a/cryptlib.spec b/cryptlib.spec
index 61de53d..861fe7b 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -329,7 +329,7 @@ tar xpzf %{SOURCE4}
%changelog
* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-2
-- including arches aarch64 and ppc64
+- include aarch64 and exclude ppc64
* Sat Feb 11 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-1
- update to version 3.4.3.1
diff --git a/sources b/sources
index 879205c..beb9ee8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cryptlib.spec) = f2b508be9ea15807d95e0a8621714f15dc0b420b6d9030477b4c9cb26f9facbaba754b4b80f7d7aa2a3f419c73839be769c7f63a170112cb8459d2910a3bd623
+SHA512 (cryptlib.spec) = 3e1743b22f7bb0209e3abed1e6551a501b7e1d808b1aedd6bf8251649ce631c8a5951008676f3f7b3324b0a03ec6785a046cd6f1559ad4a3ed316f5dc625b818
SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4
SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9
SHA512 (gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc) = afef09564e699b86bf2cbd59ccdb89f50574e49dea41534eaef40f50971b2f5db0ae9578da97cd5dd9fbbc37041247ab167157ee567b68bf9fb4ce85f2c3d8d2
commit 6b42235f46cf680e55f507b583dcb3a61edfad48
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 12:24:43 2017 +0200
add arches aarch64 and ppc64
diff --git a/.gitignore b/.gitignore
index da79c96..5b32187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@
/cl3431_fedora.zip
/cl3431_fedora.zip.sig
/cryptlib.spec
+/gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc
+/README-manual
+/ccflagspatch
+/javapatch
+/nativepatch
diff --git a/cryptlib.spec b/cryptlib.spec
index 2142918..61de53d 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -27,7 +27,8 @@ Patch1: ccflagspatch
Patch2: javapatch
Patch3: nativepatch
-ExclusiveArch: x86_64 %{ix86} aarch64 ppc64
+ExclusiveArch: x86_64 %{ix86} aarch64
+# arch ppc64 is deliberately excluded, because bignum assembler code fails to compile
BuildRequires: gcc
BuildRequires: libbsd-devel
diff --git a/sources b/sources
index 5e1c4ae..879205c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cryptlib.spec) = 948a61b3184fde1373e22e04e4fc80f6736afbf7055f6703ca882ccdb21caaa6cd1a0e066b901f948abf1ff80dff7d5177743271ae500aadf29f153130fba54e
+SHA512 (cryptlib.spec) = f2b508be9ea15807d95e0a8621714f15dc0b420b6d9030477b4c9cb26f9facbaba754b4b80f7d7aa2a3f419c73839be769c7f63a170112cb8459d2910a3bd623
SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4
SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9
SHA512 (gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc) = afef09564e699b86bf2cbd59ccdb89f50574e49dea41534eaef40f50971b2f5db0ae9578da97cd5dd9fbbc37041247ab167157ee567b68bf9fb4ce85f2c3d8d2
commit 7ddd640aa178db815c4bafac3b08134e9553c196
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 12:08:26 2017 +0200
add arches aarch64 and ppc64
diff --git a/.gitignore b/.gitignore
index 00a0e69..da79c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@
/cl3431_fedora.zip
/cl3431_fedora.zip.sig
/cryptlib.spec
-/nativepatch
diff --git a/ccflagspatch b/ccflagspatch
index 98ae123..e7a9ef8 100644
--- a/ccflagspatch
+++ b/ccflagspatch
@@ -1,5 +1,5 @@
---- cl-original/makefile 2016-03-25 03:33:28.000000000 +0000
-+++ cl-patched/makefile 2016-05-05 13:17:15.000000000 +0100
+--- cl-original/makefile 2017-02-10 20:01:44.169832047 +0100
++++ cl-patched/makefile 2017-02-10 20:04:05.578130793 +0100
@@ -90,7 +90,7 @@
# Further cc flags are gathered dynamically at runtime via the ccopts.sh
# script.
diff --git a/javapatch b/javapatch
index cd18952..6fa80bc 100644
--- a/javapatch
+++ b/javapatch
@@ -1,6 +1,6 @@
---- cl-original/misc/config.h 2016-05-25 11:10:17.953572221 +0200
-+++ cl-patched/misc/config.h 2016-05-25 11:09:20.992950490 +0200
-@@ -141,7 +141,7 @@
+--- cl-original/misc/config.h 2017-02-10 20:01:59.643864738 +0100
++++ cl-patched/misc/config.h 2017-02-10 20:04:20.050161365 +0100
+@@ -142,7 +142,7 @@
/* Whether to build the Java/JNI interface or not */
diff --git a/nativepatch b/nativepatch
new file mode 100644
index 0000000..6ddd68f
--- /dev/null
+++ b/nativepatch
@@ -0,0 +1,11 @@
+--- cl-original/tools/ccopts.sh 2017-02-11 18:35:50.168805668 +0100
++++ cl-patched/tools/ccopts.sh 2017-02-11 18:39:04.861202195 +0100
+@@ -471,7 +471,7 @@
+ CCARGS="$CCARGS -march=pentium" ;;
+ esac ;
+ else
+- CCARGS="$CCARGS -mcpu=pentium" ;
++ CCARGS="$CCARGS -march=native" ;
+ fi ;
+ fi
+
diff --git a/sources b/sources
index 06fd33f..5e1c4ae 100644
--- a/sources
+++ b/sources
@@ -1 +1,10 @@
SHA512 (cryptlib.spec) = 948a61b3184fde1373e22e04e4fc80f6736afbf7055f6703ca882ccdb21caaa6cd1a0e066b901f948abf1ff80dff7d5177743271ae500aadf29f153130fba54e
+SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4
+SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9
+SHA512 (gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc) = afef09564e699b86bf2cbd59ccdb89f50574e49dea41534eaef40f50971b2f5db0ae9578da97cd5dd9fbbc37041247ab167157ee567b68bf9fb4ce85f2c3d8d2
+SHA512 (README-manual) = ee6f1fe26828fd53d502218eddb0d292f9a99eec18a1bfdbc8ac29e15de597f1382c83f6e85ee3dcc236b1717e29c241e6405d9378ca4ae2e88fe3918a667a3a
+SHA512 (cryptlib-tests.tar.gz) = 83bc6061f0b76e5e46100a21965b8362ab1a2c1c4fcb8bcd7b87971f9f4fd59861685b47d72394f40295076f2b2d7993223c535ed21c8ea352551b65f71e1801
+SHA512 (cryptlib-perlfiles.tar.gz) = b975d34acfd1d99a224bbd5536483e5489feac8801a567740ec668bcef9a1eff67fddbdad53f61b2ff48bd43396e92f070ebf4de622f3edeb70428f4aaae2ff6
+SHA512 (ccflagspatch) = e458a3477c72760e49eadaf3e2cc903d4840707fab9f9f2b3d98db3fdb9d8adf5e7d18c80b0e49e6f0799957f22361f713d03421a4ad642bcd4192e80d2a4921
+SHA512 (javapatch) = 05edd4765954e4c763e54b8d9cebb78c3f55b075f516e941ae0e20b74e4feca07cf13231bef68ed943726402a965c31a734398faf8a288e977a97823e0e7afa6
+SHA512 (nativepatch) = bd57d1099c9650c0ec4848485308ff01c55f2e3663780fd12648507e627dbe6ca5ee6ca078d2364494a679aff17da59429fa846580a539ce3f6d5de3ebece966
commit aefdddb79eede043403f06753637f080a7eb5cc0
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 11:17:41 2017 +0200
add arches aarch64 and ppc64
diff --git a/cryptlib.spec b/cryptlib.spec
index d70e0f5..2142918 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -326,9 +326,6 @@ tar xpzf %{SOURCE4}
%changelog
-* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 3.4.3.1-2
-- Perl 5.26 rebuild
-
* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-2
- including arches aarch64 and ppc64
commit 259b22da5ee26183f795293a96214255bbeb88ab
Merge: 9a9b9d1 74ec908
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 11:16:07 2017 +0200
Merge branch 'master' of ssh://pkgs.fedoraproject.org/cryptlib
diff --cc cryptlib.spec
index 2142918,a580d17..d70e0f5
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@@ -326,10 -326,10 +326,13 @@@ tar xpzf %{SOURCE4
%changelog
+ * Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 3.4.3.1-2
+ - Perl 5.26 rebuild
+
+* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-2
+- including arches aarch64 and ppc64
+
* Sat Feb 11 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-1
- update to version 3.4.3.1
commit 9a9b9d15aa0b535ea158136b20b108ac53849476
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 11:14:26 2017 +0200
add arches aarch64 and ppc64
diff --git a/cryptlib.spec b/cryptlib.spec
index c1575f9..2142918 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -6,7 +6,7 @@
Name: cryptlib
Version: 3.4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Security library and toolkit for encryption and authentication services
Group: System Environment/Libraries
@@ -27,7 +27,7 @@ Patch1: ccflagspatch
Patch2: javapatch
Patch3: nativepatch
-ExclusiveArch: x86_64 %{ix86} %{arm}
+ExclusiveArch: x86_64 %{ix86} aarch64 ppc64
BuildRequires: gcc
BuildRequires: libbsd-devel
@@ -327,6 +327,9 @@ tar xpzf %{SOURCE4}
%changelog
+* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-2
+- including arches aarch64 and ppc64
+
* Sat Feb 11 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-1
- update to version 3.4.3.1
diff --git a/sources b/sources
index 0e8eb75..06fd33f 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4
-SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9
-SHA512 (cryptlib-perlfiles.tar.gz) = b975d34acfd1d99a224bbd5536483e5489feac8801a567740ec668bcef9a1eff67fddbdad53f61b2ff48bd43396e92f070ebf4de622f3edeb70428f4aaae2ff6
-SHA512 (cryptlib-tests.tar.gz) = 83bc6061f0b76e5e46100a21965b8362ab1a2c1c4fcb8bcd7b87971f9f4fd59861685b47d72394f40295076f2b2d7993223c535ed21c8ea352551b65f71e1801
-SHA512 (cryptlib.spec) = 8e604f1824d1a82817c2c6b4d78d57b351de0e3256e7c1ed562168e41ccec6b66da7552aabe2c0acad9daab59a64eb9fc5d28a9aad1914b6d536edef2de2679d
-SHA512 (nativepatch) = bd57d1099c9650c0ec4848485308ff01c55f2e3663780fd12648507e627dbe6ca5ee6ca078d2364494a679aff17da59429fa846580a539ce3f6d5de3ebece966
+SHA512 (cryptlib.spec) = 948a61b3184fde1373e22e04e4fc80f6736afbf7055f6703ca882ccdb21caaa6cd1a0e066b901f948abf1ff80dff7d5177743271ae500aadf29f153130fba54e
commit 74ec9088529f145177a92e2e71e64893dbdedf30
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Sun Jun 4 16:30:35 2017 +0200
Perl 5.26 rebuild
diff --git a/cryptlib.spec b/cryptlib.spec
index c1575f9..a580d17 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -6,7 +6,7 @@
Name: cryptlib
Version: 3.4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Security library and toolkit for encryption and authentication services
Group: System Environment/Libraries
@@ -326,6 +326,9 @@ tar xpzf %{SOURCE4}
%changelog
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 3.4.3.1-2
+- Perl 5.26 rebuild
+
* Sat Feb 11 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-1
- update to version 3.4.3.1
6 years, 9 months
Architecture specific change in rpms/golang-github-cznic-zappy.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-cznic-zappy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-cznic-zappy.git/com....
Change:
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a06c9a292116765f9eca8f64b5637c9e1bebdb01
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Jul 5 13:28:24 2017 +0200
Initial import (#1431743).
diff --git a/.gitignore b/.gitignore
index e69de29..50568ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/cznic-zappy-2533cb5.tar.gz
diff --git a/golang-github-cznic-zappy.spec b/golang-github-cznic-zappy.spec
new file mode 100644
index 0000000..b7f3c0f
--- /dev/null
+++ b/golang-github-cznic-zappy.spec
@@ -0,0 +1,181 @@
+# Generate devel rpm
+%global with_devel 1
+# Build project from bundled dependencies
+%global with_bundled 0
+# Build with debug info rpm
+%global with_debug 0
+
+# Tests need to download test data during execution of "go test",
+# so they have to be disabled for package builds.
+# Also, since the source directory isn't writable when installed,
+# a unit tests package makes no sense because "go test" can't
+# download the test data to the location where the tests expects it.
+
+# Run tests in check section
+%global with_check 0
+# Generate unit-test rpm
+%global with_unit_test 0
+
+%if 0%{?with_debug}
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package %{nil}
+%endif
+
+%global provider github
+%global provider_tld com
+%global project cznic
+%global repo zappy
+# https://github.com/cznic/zappy
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider_prefix}
+%global commit 2533cb5b45cc6c07421468ce262899ddc9d53fb7
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20160723
+
+
+Name: golang-%{provider}-%{project}-%{repo}
+Version: 0
+Release: 0.1.%{commitdate}.git%{shortcommit}%{?dist}
+Summary: Block-based compression format implementation in Go
+License: BSD
+URL: https://%{provider_prefix}
+Source0: https://%{provider_prefix}/archive/%{commit}/cznic-%{repo}-%{shortcommit}.tar.gz
+
+# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
+# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
+BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+
+%description
+%{summary}
+
+
+%if 0%{?with_devel}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%if 0%{?with_check} && ! 0%{?with_bundled}
+BuildRequires: golang(github.com/cznic/internal/buffer)
+%endif
+
+Requires: golang(github.com/cznic/internal/buffer)
+
+Provides: golang(%{import_path}) = %{version}-%{release}
+
+%description devel
+%{summary}
+
+This package contains library source intended for
+building other packages which use import path with
+%{import_path} prefix.
+%endif
+
+
+%if 0%{?with_unit_test} && 0%{?with_devel}
+%package unit-test-devel
+Summary: Unit tests for %{name} package
+
+# test subpackage tests code from devel subpackage
+Requires: %{name}-devel = %{version}-%{release}
+
+%if 0%{?with_check} && ! 0%{?with_bundled}
+BuildRequires: golang(github.com/golang/snappy)
+%endif
+
+Requires: golang(github.com/golang/snappy)
+
+%description unit-test-devel
+%{summary}
+
+This package contains unit tests for project
+providing packages with %{import_path} prefix.
+%endif
+
+
+%prep
+%setup -q -n %{repo}-%{commit}
+
+
+%build
+
+
+%install
+# source codes for building projects
+%if 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
+
+# find all *.go but no *_test.go files and generate devel.file-list
+for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
+ dirprefix=$(dirname $file)
+ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
+ cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+ echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
+
+ while [ "$dirprefix" != "." ]; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+ dirprefix=$(dirname $dirprefix)
+ done
+done
+%endif
+
+# testing files for this project
+%if 0%{?with_unit_test} && 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+
+# find all *_test.go files and generate unit-test-devel.file-list
+for file in $(find . -iname "*_test.go") ; do
+ dirprefix=$(dirname $file)
+ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
+ cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+ echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
+
+ while [ "$dirprefix" != "." ]; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+ dirprefix=$(dirname $dirprefix)
+ done
+done
+%endif
+
+%if 0%{?with_devel}
+sort -u -o devel.file-list devel.file-list
+%endif
+
+
+%check
+%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+
+%if ! 0%{?gotest:1}
+%global gotest go test
+%endif
+
+%gotest %{import_path}
+%endif
+
+
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
+
+%if 0%{?with_devel}
+%files devel -f devel.file-list
+%license LICENSE SNAPPY-GO-LICENSE
+%doc CONTRIBUTORS README.md AUTHORS
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%endif
+
+
+%if 0%{?with_unit_test} && 0%{?with_devel}
+%files unit-test-devel -f unit-test-devel.file-list
+%license LICENSE SNAPPY-GO-LICENSE
+%doc CONTRIBUTORS README.md AUTHORS
+%endif
+
+
+%changelog
+* Sat Mar 11 2017 Fabio Valentini <decathorpe(a)gmail.com> - 0-0.1.20160723.git2533cb5
+- First package for Fedora
+
diff --git a/sources b/sources
index e69de29..fd38c44 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (cznic-zappy-2533cb5.tar.gz) = 70735904452e11146fca05340e4139cb03554701d2f502741aa9147ec7d0b3c5eb6bdfd2763b9ea97d04362430241ae81e278d3b84f62fa5732365ca3e25dc18
6 years, 9 months
Architecture specific change in rpms/golang-github-cznic-zappy.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-cznic-zappy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-cznic-zappy.git/com....
Change:
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a06c9a292116765f9eca8f64b5637c9e1bebdb01
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Jul 5 13:28:24 2017 +0200
Initial import (#1431743).
diff --git a/.gitignore b/.gitignore
index e69de29..50568ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/cznic-zappy-2533cb5.tar.gz
diff --git a/golang-github-cznic-zappy.spec b/golang-github-cznic-zappy.spec
new file mode 100644
index 0000000..b7f3c0f
--- /dev/null
+++ b/golang-github-cznic-zappy.spec
@@ -0,0 +1,181 @@
+# Generate devel rpm
+%global with_devel 1
+# Build project from bundled dependencies
+%global with_bundled 0
+# Build with debug info rpm
+%global with_debug 0
+
+# Tests need to download test data during execution of "go test",
+# so they have to be disabled for package builds.
+# Also, since the source directory isn't writable when installed,
+# a unit tests package makes no sense because "go test" can't
+# download the test data to the location where the tests expects it.
+
+# Run tests in check section
+%global with_check 0
+# Generate unit-test rpm
+%global with_unit_test 0
+
+%if 0%{?with_debug}
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package %{nil}
+%endif
+
+%global provider github
+%global provider_tld com
+%global project cznic
+%global repo zappy
+# https://github.com/cznic/zappy
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider_prefix}
+%global commit 2533cb5b45cc6c07421468ce262899ddc9d53fb7
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20160723
+
+
+Name: golang-%{provider}-%{project}-%{repo}
+Version: 0
+Release: 0.1.%{commitdate}.git%{shortcommit}%{?dist}
+Summary: Block-based compression format implementation in Go
+License: BSD
+URL: https://%{provider_prefix}
+Source0: https://%{provider_prefix}/archive/%{commit}/cznic-%{repo}-%{shortcommit}.tar.gz
+
+# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
+# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
+BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+
+%description
+%{summary}
+
+
+%if 0%{?with_devel}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%if 0%{?with_check} && ! 0%{?with_bundled}
+BuildRequires: golang(github.com/cznic/internal/buffer)
+%endif
+
+Requires: golang(github.com/cznic/internal/buffer)
+
+Provides: golang(%{import_path}) = %{version}-%{release}
+
+%description devel
+%{summary}
+
+This package contains library source intended for
+building other packages which use import path with
+%{import_path} prefix.
+%endif
+
+
+%if 0%{?with_unit_test} && 0%{?with_devel}
+%package unit-test-devel
+Summary: Unit tests for %{name} package
+
+# test subpackage tests code from devel subpackage
+Requires: %{name}-devel = %{version}-%{release}
+
+%if 0%{?with_check} && ! 0%{?with_bundled}
+BuildRequires: golang(github.com/golang/snappy)
+%endif
+
+Requires: golang(github.com/golang/snappy)
+
+%description unit-test-devel
+%{summary}
+
+This package contains unit tests for project
+providing packages with %{import_path} prefix.
+%endif
+
+
+%prep
+%setup -q -n %{repo}-%{commit}
+
+
+%build
+
+
+%install
+# source codes for building projects
+%if 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
+
+# find all *.go but no *_test.go files and generate devel.file-list
+for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
+ dirprefix=$(dirname $file)
+ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
+ cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+ echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
+
+ while [ "$dirprefix" != "." ]; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+ dirprefix=$(dirname $dirprefix)
+ done
+done
+%endif
+
+# testing files for this project
+%if 0%{?with_unit_test} && 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+
+# find all *_test.go files and generate unit-test-devel.file-list
+for file in $(find . -iname "*_test.go") ; do
+ dirprefix=$(dirname $file)
+ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
+ cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+ echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
+
+ while [ "$dirprefix" != "." ]; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+ dirprefix=$(dirname $dirprefix)
+ done
+done
+%endif
+
+%if 0%{?with_devel}
+sort -u -o devel.file-list devel.file-list
+%endif
+
+
+%check
+%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+
+%if ! 0%{?gotest:1}
+%global gotest go test
+%endif
+
+%gotest %{import_path}
+%endif
+
+
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
+
+%if 0%{?with_devel}
+%files devel -f devel.file-list
+%license LICENSE SNAPPY-GO-LICENSE
+%doc CONTRIBUTORS README.md AUTHORS
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%endif
+
+
+%if 0%{?with_unit_test} && 0%{?with_devel}
+%files unit-test-devel -f unit-test-devel.file-list
+%license LICENSE SNAPPY-GO-LICENSE
+%doc CONTRIBUTORS README.md AUTHORS
+%endif
+
+
+%changelog
+* Sat Mar 11 2017 Fabio Valentini <decathorpe(a)gmail.com> - 0-0.1.20160723.git2533cb5
+- First package for Fedora
+
diff --git a/sources b/sources
index e69de29..fd38c44 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (cznic-zappy-2533cb5.tar.gz) = 70735904452e11146fca05340e4139cb03554701d2f502741aa9147ec7d0b3c5eb6bdfd2763b9ea97d04362430241ae81e278d3b84f62fa5732365ca3e25dc18
6 years, 9 months
Architecture specific change in rpms/golang-github-cznic-zappy.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-cznic-zappy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-cznic-zappy.git/com....
Change:
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a06c9a292116765f9eca8f64b5637c9e1bebdb01
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Jul 5 13:28:24 2017 +0200
Initial import (#1431743).
diff --git a/.gitignore b/.gitignore
index e69de29..50568ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/cznic-zappy-2533cb5.tar.gz
diff --git a/golang-github-cznic-zappy.spec b/golang-github-cznic-zappy.spec
new file mode 100644
index 0000000..b7f3c0f
--- /dev/null
+++ b/golang-github-cznic-zappy.spec
@@ -0,0 +1,181 @@
+# Generate devel rpm
+%global with_devel 1
+# Build project from bundled dependencies
+%global with_bundled 0
+# Build with debug info rpm
+%global with_debug 0
+
+# Tests need to download test data during execution of "go test",
+# so they have to be disabled for package builds.
+# Also, since the source directory isn't writable when installed,
+# a unit tests package makes no sense because "go test" can't
+# download the test data to the location where the tests expects it.
+
+# Run tests in check section
+%global with_check 0
+# Generate unit-test rpm
+%global with_unit_test 0
+
+%if 0%{?with_debug}
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package %{nil}
+%endif
+
+%global provider github
+%global provider_tld com
+%global project cznic
+%global repo zappy
+# https://github.com/cznic/zappy
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider_prefix}
+%global commit 2533cb5b45cc6c07421468ce262899ddc9d53fb7
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20160723
+
+
+Name: golang-%{provider}-%{project}-%{repo}
+Version: 0
+Release: 0.1.%{commitdate}.git%{shortcommit}%{?dist}
+Summary: Block-based compression format implementation in Go
+License: BSD
+URL: https://%{provider_prefix}
+Source0: https://%{provider_prefix}/archive/%{commit}/cznic-%{repo}-%{shortcommit}.tar.gz
+
+# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
+# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
+BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+
+%description
+%{summary}
+
+
+%if 0%{?with_devel}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%if 0%{?with_check} && ! 0%{?with_bundled}
+BuildRequires: golang(github.com/cznic/internal/buffer)
+%endif
+
+Requires: golang(github.com/cznic/internal/buffer)
+
+Provides: golang(%{import_path}) = %{version}-%{release}
+
+%description devel
+%{summary}
+
+This package contains library source intended for
+building other packages which use import path with
+%{import_path} prefix.
+%endif
+
+
+%if 0%{?with_unit_test} && 0%{?with_devel}
+%package unit-test-devel
+Summary: Unit tests for %{name} package
+
+# test subpackage tests code from devel subpackage
+Requires: %{name}-devel = %{version}-%{release}
+
+%if 0%{?with_check} && ! 0%{?with_bundled}
+BuildRequires: golang(github.com/golang/snappy)
+%endif
+
+Requires: golang(github.com/golang/snappy)
+
+%description unit-test-devel
+%{summary}
+
+This package contains unit tests for project
+providing packages with %{import_path} prefix.
+%endif
+
+
+%prep
+%setup -q -n %{repo}-%{commit}
+
+
+%build
+
+
+%install
+# source codes for building projects
+%if 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
+
+# find all *.go but no *_test.go files and generate devel.file-list
+for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
+ dirprefix=$(dirname $file)
+ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
+ cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+ echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
+
+ while [ "$dirprefix" != "." ]; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+ dirprefix=$(dirname $dirprefix)
+ done
+done
+%endif
+
+# testing files for this project
+%if 0%{?with_unit_test} && 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+
+# find all *_test.go files and generate unit-test-devel.file-list
+for file in $(find . -iname "*_test.go") ; do
+ dirprefix=$(dirname $file)
+ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
+ cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+ echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
+
+ while [ "$dirprefix" != "." ]; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
+ dirprefix=$(dirname $dirprefix)
+ done
+done
+%endif
+
+%if 0%{?with_devel}
+sort -u -o devel.file-list devel.file-list
+%endif
+
+
+%check
+%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+
+%if ! 0%{?gotest:1}
+%global gotest go test
+%endif
+
+%gotest %{import_path}
+%endif
+
+
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
+
+%if 0%{?with_devel}
+%files devel -f devel.file-list
+%license LICENSE SNAPPY-GO-LICENSE
+%doc CONTRIBUTORS README.md AUTHORS
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%endif
+
+
+%if 0%{?with_unit_test} && 0%{?with_devel}
+%files unit-test-devel -f unit-test-devel.file-list
+%license LICENSE SNAPPY-GO-LICENSE
+%doc CONTRIBUTORS README.md AUTHORS
+%endif
+
+
+%changelog
+* Sat Mar 11 2017 Fabio Valentini <decathorpe(a)gmail.com> - 0-0.1.20160723.git2533cb5
+- First package for Fedora
+
diff --git a/sources b/sources
index e69de29..fd38c44 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (cznic-zappy-2533cb5.tar.gz) = 70735904452e11146fca05340e4139cb03554701d2f502741aa9147ec7d0b3c5eb6bdfd2763b9ea97d04362430241ae81e278d3b84f62fa5732365ca3e25dc18
6 years, 9 months
Architecture specific change in rpms/cryptlib.git
by githook-noreply@fedoraproject.org
The package rpms/cryptlib.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cryptlib.git/commit/?id=6b42235f4....
Change:
+ExclusiveArch: x86_64 %{ix86} aarch64
Thanks.
Full change:
============
commit 6b42235f46cf680e55f507b583dcb3a61edfad48
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 12:24:43 2017 +0200
add arches aarch64 and ppc64
diff --git a/.gitignore b/.gitignore
index da79c96..5b32187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@
/cl3431_fedora.zip
/cl3431_fedora.zip.sig
/cryptlib.spec
+/gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc
+/README-manual
+/ccflagspatch
+/javapatch
+/nativepatch
diff --git a/cryptlib.spec b/cryptlib.spec
index 2142918..61de53d 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -27,7 +27,8 @@ Patch1: ccflagspatch
Patch2: javapatch
Patch3: nativepatch
-ExclusiveArch: x86_64 %{ix86} aarch64 ppc64
+ExclusiveArch: x86_64 %{ix86} aarch64
+# arch ppc64 is deliberately excluded, because bignum assembler code fails to compile
BuildRequires: gcc
BuildRequires: libbsd-devel
diff --git a/sources b/sources
index 5e1c4ae..879205c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cryptlib.spec) = 948a61b3184fde1373e22e04e4fc80f6736afbf7055f6703ca882ccdb21caaa6cd1a0e066b901f948abf1ff80dff7d5177743271ae500aadf29f153130fba54e
+SHA512 (cryptlib.spec) = f2b508be9ea15807d95e0a8621714f15dc0b420b6d9030477b4c9cb26f9facbaba754b4b80f7d7aa2a3f419c73839be769c7f63a170112cb8459d2910a3bd623
SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4
SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9
SHA512 (gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc) = afef09564e699b86bf2cbd59ccdb89f50574e49dea41534eaef40f50971b2f5db0ae9578da97cd5dd9fbbc37041247ab167157ee567b68bf9fb4ce85f2c3d8d2
6 years, 9 months
Architecture specific change in rpms/eclipse.git
by githook-noreply@fedoraproject.org
The package rpms/eclipse.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse.git/commit/?id=c736234c3b...
https://src.fedoraproject.org/cgit/rpms/eclipse.git/commit/?id=6db7b846d4....
Change:
+%ifarch s390 s390x x86_64 aarch64 ppc64le
+%ifarch s390x x86_64 aarch64 ppc64le
Thanks.
Full change:
============
commit 1aa3dbe31beb70bbf9a330a123e97eb34f69905a
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Tue Jul 4 14:07:33 2017 +0100
Use 'protect root' instead of 'protect master'
diff --git a/eclipse.spec b/eclipse.spec
index 4b38dce..a90b1be 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -692,7 +692,7 @@ popd
# ini file adjustements
sed -i "s|-Xms40m|-Xms512m|g" eclipse.ini
sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini
-sed -i '1i-protect\nmaster' eclipse.ini
+sed -i '1i-protect\nroot' eclipse.ini
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
cat >> eclipse.ini <<EOF
@@ -1054,6 +1054,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Tue Jul 04 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-2
+- Use 'protect root' instead of 'protect master'
+
* Fri Jun 30 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-1
- Update to final Oxygen release
- Bump jetty requirement
commit 3446dc9a62ef73d805685cb81c6311f229b37508
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Mon Jul 3 19:44:11 2017 +0100
Update to final Oxygen release
Bump jetty requirement
diff --git a/eclipse.spec b/eclipse.spec
index 61a8515..4b38dce 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,9 +6,9 @@
Epoch: 1
%global eb_commit 2ec387778205043124434190b43f747551fd36fc
-%global eclipse_tag S4_7_0_RC4a
+%global eclipse_tag R4_7
-%global _jetty_version 9.4.3
+%global _jetty_version 9.4.6
%global _lucene_version 6.1.0
%ifarch %{ix86}
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.14%{?dist}
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -128,8 +128,9 @@ BuildRequires: tycho
BuildRequires: tycho-extras
BuildRequires: cbi-plugins
BuildRequires: maven-antrun-plugin
-BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-assembly-plugin
BuildRequires: maven-dependency-plugin
+BuildRequires: maven-enforcer-plugin
BuildRequires: maven-install-plugin
BuildRequires: xml-maven-plugin
BuildRequires: rhino
@@ -291,7 +292,7 @@ Requires: %{name}-swt = %{epoch}:%{version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
Requires: httpcomponents-core
Requires: httpcomponents-client
-Requires: osgi(org.tukaani.xz) >= 1.6
+Requires: osgi(org.tukaani.xz)
# Provides/obsoletes added in F26
# This is the best place to add this because adding it to the nls RPMs causes every
@@ -580,7 +581,7 @@ done
mkdir rhino
pushd rhino
xmvn -B -o install:install-file -Dfile=%{_root_datadir}/java/rhino.jar -Dpackaging=jar \
- -DgroupId=org.mozilla -DartifactId=rhino -Dversion=1.7R4
+ -DgroupId=org.mozilla -DartifactId=rhino -Dversion=1.7.7.1
popd
%endif
@@ -705,6 +706,7 @@ cat >> eclipse.ini <<EOF
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
-Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
-Declipse.p2.skipMovedInstallDetection=true
+-Dosgi.resolver.usesMode=ignore
EOF
popd #eclipse
@@ -712,6 +714,11 @@ popd #eclipse
%install
%mvn_install
+%if 0%{?rhel}
+# Quote paths that contain spaces, necessary on rhel
+sed -i -e 's|\(%{_prefix}.*\)|"\1"|' .mfiles*
+%endif
+
# Some directories we need
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
install -d -m 755 $RPM_BUILD_ROOT%{_jnidir}
@@ -1047,6 +1054,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Fri Jun 30 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-1
+- Update to final Oxygen release
+- Bump jetty requirement
+
* Thu Jun 15 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.14
- Update to latest release candidate build
- Rebuild for latest EMF and ECF
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 8c0f59c..1c9be80 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=S4_7_0_RC4a
+TAG=R4_7
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index 6ded4e2..ee34fa5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (org.eclipse.linuxtools.eclipse-build-2ec387778205043124434190b43f747551fd36fc.tar.xz) = ce351ac1658304b9d2661dde73d7f0bd3e7e57c690cfac561bf08f4d14a3db0b7ffe0cac27d75f4ef7b31fefd7ebe65383e68873f8e0083758949dd7ec8f46b0
-SHA512 (R4_platform-aggregator-S4_7_0_RC4a.tar.xz) = e1b964d00e02511499a00d41fdc33ab522349046be1fd6e90b0fe3b233d120016a2353a668d3493720b381c3639eb84da2793c6b2dc3044bdcbf037cf1bdd17f
+SHA512 (R4_platform-aggregator-R4_7.tar.xz) = 1d05f76b707eee35af2d684353c38bf3777ba6c10e75270bd14a4e75f93a8d54d95ba06bc6ca8846c5f02ff0c2b0b529e1f3376b570e101e8163cf0a280a036b
commit 67799d4caaa39efa148559c6c2ce293ca7bf9bf6
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu Jun 15 14:24:10 2017 +0100
Update to latest release candidate build
Rebuild for latest EMF and ECF
Drop nashorn extension mechanism
diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch
index df2301a..fd7290c 100644
--- a/eclipse-debug-symbols.patch
+++ b/eclipse-debug-symbols.patch
@@ -31,8 +31,8 @@
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
--CFLAGS = ${M_ARCH} -g -s -Wall\
-+CFLAGS = ${M_ARCH} -g -Wall\
+-CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
++CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
-fpic \
-DLINUX \
-DMOZILLA_FIX \
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index d20812d..e295128 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -70,7 +70,7 @@
</execution>
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
-@@ -73,6 +73,8 @@
+@@ -72,6 +72,8 @@
<plugin id="org.eclipse.core.net.linux.x86_64"/>
<plugin id="org.eclipse.core.net.win32.x86"/>
<plugin id="org.eclipse.core.net.win32.x86_64"/>
@@ -81,7 +81,7 @@
</execution>
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
-@@ -46,6 +46,21 @@
+@@ -45,6 +45,21 @@
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
@@ -112,10 +112,10 @@
- <requires>
- <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
- <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
-- <import feature="org.eclipse.ecf.core.feature.source" version="1.3.0" match="compatible"/>
+- <import feature="org.eclipse.ecf.core.feature.source" version="1.4.0" match="compatible"/>
- <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
-- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.3" match="compatible"/>
-- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.3" match="compatible"/>
+- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
+- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.7" match="compatible"/>
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
- </requires>
diff --git a/eclipse.spec b/eclipse.spec
index 6ffa099..61a8515 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,7 +6,7 @@
Epoch: 1
%global eb_commit 2ec387778205043124434190b43f747551fd36fc
-%global eclipse_tag I20170515-0910
+%global eclipse_tag S4_7_0_RC4a
%global _jetty_version 9.4.3
%global _lucene_version 6.1.0
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.13%{?dist}
+Release: 0.14%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -124,8 +124,8 @@ Patch29: fix_ant_build.patch
Patch30: eclipse-hide-droplets-from-install-wizard.patch
BuildRequires: maven-local
-BuildRequires: tycho >= 0.25.0
-BuildRequires: tycho-extras >= 0.25.0
+BuildRequires: tycho
+BuildRequires: tycho-extras
BuildRequires: cbi-plugins
BuildRequires: maven-antrun-plugin
BuildRequires: maven-enforcer-plugin
@@ -183,7 +183,7 @@ BuildRequires: lucene-queryparser >= %{_lucene_version}
BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version}
BuildRequires: junit >= 4.12
BuildRequires: hamcrest >= 1.3
-BuildRequires: sat4j >= 2.3.5-1
+BuildRequires: sat4j
BuildRequires: objectweb-asm >= 5.0.3-1
BuildRequires: sac
BuildRequires: batik-css
@@ -191,8 +191,8 @@ BuildRequires: xml-commons-apis
BuildRequires: atinject
BuildRequires: atinject-tck
BuildRequires: eclipse-filesystem
-BuildRequires: eclipse-ecf-core >= 3.13.6-1
-BuildRequires: eclipse-emf-core >= 1:2.13.0-0.1
+BuildRequires: eclipse-ecf-core >= 3.13.7-1
+BuildRequires: eclipse-emf-core >= 1:2.13.0-1
BuildRequires: eclipse-license
BuildRequires: glassfish-el-api >= 3.0.1
BuildRequires: glassfish-el >= 3.0.1
@@ -204,11 +204,12 @@ BuildRequires: httpcomponents-client
BuildRequires: xz-java
BuildRequires: mockito
BuildRequires: osgi(osgi.annotation)
-%if ! %{bootstrap}
# Build deps that are excluded when bootstrapping
+%if ! %{bootstrap}
+# For building docs and apitooling
BuildRequires: eclipse-pde
-# Build deps needed for contributor tools
-BuildRequires: eclipse-egit >= 4.0.0
+# For contributor tools
+BuildRequires: eclipse-egit
BuildRequires: eclipse-emf-runtime
%endif
@@ -273,13 +274,13 @@ Requires: lucene-misc >= %{_lucene_version}
Requires: lucene-analysis >= %{_lucene_version}
Requires: lucene-queryparser >= %{_lucene_version}
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
-Requires: sat4j >= 2.3.5-1
+Requires: sat4j
Requires: sac
Requires: batik-css
Requires: xml-commons-apis
Requires: atinject
-Requires: eclipse-ecf-core >= 3.13.6-1
-Requires: eclipse-emf-core >= 1:2.13.0-0.1
+Requires: eclipse-ecf-core >= 3.13.7-1
+Requires: eclipse-emf-core >= 1:2.13.0-1
Requires: glassfish-el-api >= 3.0.1
Requires: glassfish-el >= 3.0.1
Requires: glassfish-jsp-api >= 2.2.1-4
@@ -704,7 +705,6 @@ cat >> eclipse.ini <<EOF
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
-Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
-Declipse.p2.skipMovedInstallDetection=true
--Dosgi.framework.extensions=org.eclipse.wst.jsdt.nashorn.extension
EOF
popd #eclipse
@@ -1047,6 +1047,11 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Thu Jun 15 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.14
+- Update to latest release candidate build
+- Rebuild for latest EMF and ECF
+- Drop nashorn extension mechanism
+
* Wed May 31 2017 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:4.7.0-0.13
- Add missing build-requires on Maven plugins
- Run xmvn in batch mode
diff --git a/get-eclipse.sh b/get-eclipse.sh
index bed5daf..8c0f59c 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=I20170515-0910
+TAG=S4_7_0_RC4a
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index cea7811..6ded4e2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (org.eclipse.linuxtools.eclipse-build-2ec387778205043124434190b43f747551fd36fc.tar.xz) = ce351ac1658304b9d2661dde73d7f0bd3e7e57c690cfac561bf08f4d14a3db0b7ffe0cac27d75f4ef7b31fefd7ebe65383e68873f8e0083758949dd7ec8f46b0
-SHA512 (R4_platform-aggregator-I20170515-0910.tar.xz) = 92ac2c5ea80110540f7e180bef866594f6f457924857d62606c622bea2ac63920c9840466d64dad830b07b4f71549d68ad1db05a6278aade9e86ea58e2927a3f
+SHA512 (R4_platform-aggregator-S4_7_0_RC4a.tar.xz) = e1b964d00e02511499a00d41fdc33ab522349046be1fd6e90b0fe3b233d120016a2353a668d3493720b381c3639eb84da2793c6b2dc3044bdcbf037cf1bdd17f
commit 514254ef98173d907aab5655af530f8afc2dc626
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed May 31 02:37:37 2017 +0200
Add missing build-requires on Maven plugins
Run xmvn in batch mode
diff --git a/eclipse.spec b/eclipse.spec
index da59611..6ffa099 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.12%{?dist}
+Release: 0.13%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -129,6 +129,8 @@ BuildRequires: tycho-extras >= 0.25.0
BuildRequires: cbi-plugins
BuildRequires: maven-antrun-plugin
BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-install-plugin
BuildRequires: xml-maven-plugin
BuildRequires: rhino
BuildRequires: sonatype-oss-parent
@@ -576,7 +578,7 @@ done
# Manually place rhino at correction location in reactor cache
mkdir rhino
pushd rhino
-xmvn -o install:install-file -Dfile=%{_root_datadir}/java/rhino.jar -Dpackaging=jar \
+xmvn -B -o install:install-file -Dfile=%{_root_datadir}/java/rhino.jar -Dpackaging=jar \
-DgroupId=org.mozilla -DartifactId=rhino -Dversion=1.7R4
popd
%endif
@@ -1045,6 +1047,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Wed May 31 2017 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:4.7.0-0.13
+- Add missing build-requires on Maven plugins
+- Run xmvn in batch mode
+
* Thu May 18 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.12
- Enable Wayland backend by default on F27+
- Bump some dependency requirements
commit 4a63eb6fb9fbef9032b1323c5878cf02c93c2949
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu May 18 15:45:01 2017 +0100
Enable Wayland backend by default on F27+
Bump some dependency requirements
diff --git a/eclipse.spec b/eclipse.spec
index a7c9274..da59611 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.11%{?dist}
+Release: 0.12%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -153,7 +153,7 @@ BuildRequires: pkgconfig(webkitgtk-3.0)
%else
BuildRequires: pkgconfig(webkit2gtk-4.0)
%endif
-BuildRequires: icu4j >= 1:58.2
+BuildRequires: icu4j >= 1:59.1
BuildRequires: ant >= 1.10.1
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
@@ -166,7 +166,7 @@ BuildRequires: apache-commons-fileupload
BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.0.0
BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2
BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.0.4
-BuildRequires: osgi(org.apache.felix.scr) >= 2.0.8
+BuildRequires: osgi(org.apache.felix.scr) >= 2.0.10
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
@@ -247,6 +247,7 @@ Summary: Eclipse platform common files
Recommends: eclipse-abrt
Recommends: eclipse-usage
+Requires: ant >= 1.10.1
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
Requires: jsch >= 0.1.46-2
@@ -257,7 +258,7 @@ Requires: apache-commons-jxpath
Requires: osgi(org.apache.felix.gogo.shell) >= 1.0.0
Requires: osgi(org.apache.felix.gogo.command) >= 1.0.2
Requires: osgi(org.apache.felix.gogo.runtime) >= 1.0.4
-Requires: osgi(org.apache.felix.scr) >= 2.0.8
+Requires: osgi(org.apache.felix.scr) >= 2.0.10
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
@@ -282,18 +283,12 @@ Requires: glassfish-el >= 3.0.1
Requires: glassfish-jsp-api >= 2.2.1-4
Requires: glassfish-jsp >= 2.2.5
Requires: glassfish-servlet-api >= 3.1.0
-Requires: icu4j >= 1:58.2
+Requires: icu4j >= 1:59.1
Requires: %{name}-swt = %{epoch}:%{version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
Requires: httpcomponents-core
Requires: httpcomponents-client
-%if 0%{?fedora} >= 26
-Requires: ant >= 1.10.1
Requires: osgi(org.tukaani.xz) >= 1.6
-%else
-Requires: ant >= 1.9.6
-Requires: osgi(org.tukaani.xz)
-%endif
# Provides/obsoletes added in F26
# This is the best place to add this because adding it to the nls RPMs causes every
@@ -391,7 +386,10 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch24
%patch26
%patch27
+%if 0%{?rhel} || 0%{?fedora} < 27
+# Enable wayland by default on F27+
%patch28
+%endif
%patch29
%patch30
@@ -1047,6 +1045,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Thu May 18 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.12
+- Enable Wayland backend by default on F27+
+- Bump some dependency requirements
+
* Tue May 16 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.11
- Update to latest I-build
- Rebuild for latest EMF
commit 1902f7437eafaf75edaad1f1e20475151e776e68
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu May 18 09:27:21 2017 +0100
Update to latest I-build
Rebuild for latest EMF
diff --git a/eclipse.spec b/eclipse.spec
index 4da9e2f..a7c9274 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -5,8 +5,8 @@
Epoch: 1
-%global eb_commit 8cc50cb75de7aa0d972af59c5dd74b34d793a74e
-%global eclipse_tag I20170505-2000
+%global eb_commit 2ec387778205043124434190b43f747551fd36fc
+%global eclipse_tag I20170515-0910
%global _jetty_version 9.4.3
%global _lucene_version 6.1.0
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.10%{?dist}
+Release: 0.11%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -190,7 +190,7 @@ BuildRequires: atinject
BuildRequires: atinject-tck
BuildRequires: eclipse-filesystem
BuildRequires: eclipse-ecf-core >= 3.13.6-1
-BuildRequires: eclipse-emf-core >= 1:2.12.0-1
+BuildRequires: eclipse-emf-core >= 1:2.13.0-0.1
BuildRequires: eclipse-license
BuildRequires: glassfish-el-api >= 3.0.1
BuildRequires: glassfish-el >= 3.0.1
@@ -276,7 +276,7 @@ Requires: batik-css
Requires: xml-commons-apis
Requires: atinject
Requires: eclipse-ecf-core >= 3.13.6-1
-Requires: eclipse-emf-core >= 1:2.12.0-1
+Requires: eclipse-emf-core >= 1:2.13.0-0.1
Requires: glassfish-el-api >= 3.0.1
Requires: glassfish-el >= 3.0.1
Requires: glassfish-jsp-api >= 2.2.1-4
@@ -1047,6 +1047,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Tue May 16 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.11
+- Update to latest I-build
+- Rebuild for latest EMF
+
* Tue May 09 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.10
- Rebuild for new ECF
- Obsolete core NLS package
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 7b0c411..bed5daf 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=I20170505-2000
+TAG=I20170515-0910
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index 9e013b7..cea7811 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (org.eclipse.linuxtools.eclipse-build-8cc50cb75de7aa0d972af59c5dd74b34d793a74e.tar.xz) = 39ea2659e6eb5b087dc68a7cfb586e928ef3d6e3085a514197a56c3bbce9909965891e88c9263ee87e2b914f87c2b0f3c2a751c3518dff9bbf2990d4eeef9251
-SHA512 (R4_platform-aggregator-I20170505-2000.tar.xz) = 26d02b349b4a8629d77c052d5fa44be5f956c38ccc8ebc775eace8e7c1e3091c92f75eb9260b7cdc587511b7a299726a7b5790a4dd8939c5baf30787ba0b8afa
+SHA512 (org.eclipse.linuxtools.eclipse-build-2ec387778205043124434190b43f747551fd36fc.tar.xz) = ce351ac1658304b9d2661dde73d7f0bd3e7e57c690cfac561bf08f4d14a3db0b7ffe0cac27d75f4ef7b31fefd7ebe65383e68873f8e0083758949dd7ec8f46b0
+SHA512 (R4_platform-aggregator-I20170515-0910.tar.xz) = 92ac2c5ea80110540f7e180bef866594f6f457924857d62606c622bea2ac63920c9840466d64dad830b07b4f71549d68ad1db05a6278aade9e86ea58e2927a3f
commit edec020500d70775261a9ad4646c6f70c58ce138
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Tue May 9 14:59:45 2017 +0100
Rebuild for new ECF
Obsolete core NLS package
Fix cycle introduced between tests and contributor-tools
diff --git a/eclipse.spec b/eclipse.spec
index 7bef190..4da9e2f 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -189,7 +189,7 @@ BuildRequires: xml-commons-apis
BuildRequires: atinject
BuildRequires: atinject-tck
BuildRequires: eclipse-filesystem
-BuildRequires: eclipse-ecf-core >= 3.13.3-1
+BuildRequires: eclipse-ecf-core >= 3.13.6-1
BuildRequires: eclipse-emf-core >= 1:2.12.0-1
BuildRequires: eclipse-license
BuildRequires: glassfish-el-api >= 3.0.1
@@ -275,7 +275,7 @@ Requires: sac
Requires: batik-css
Requires: xml-commons-apis
Requires: atinject
-Requires: eclipse-ecf-core >= 3.13.3-1
+Requires: eclipse-ecf-core >= 3.13.6-1
Requires: eclipse-emf-core >= 1:2.12.0-1
Requires: glassfish-el-api >= 3.0.1
Requires: glassfish-el >= 3.0.1
@@ -295,6 +295,13 @@ Requires: ant >= 1.9.6
Requires: osgi(org.tukaani.xz)
%endif
+# Provides/obsoletes added in F26
+# This is the best place to add this because adding it to the nls RPMs causes every
+# single language pack to be installed, which is not desireable -- it needs to be
+# obsoleted by exactly one thing.
+Provides: eclipse-nls = %{version}-%{release}
+Obsoletes: eclipse-nls < %{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.
@@ -544,6 +551,9 @@ sed -i -e '/<\/excludes>/i<plugin id="org.eclipse.jdt.core.compiler.batch"/>' \
%pom_xpath_inject "feature" '<plugin id="org.mockito.mockito-core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>' eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
%pom_xpath_inject "feature" '<plugin id="net.sf.cglib.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>' eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
+# Prevent dep cycle
+%pom_xpath_remove "plugin[@id='org.eclipse.core.tests.harness']" eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
+
# Include maven descriptors to allow our test execution setup to work
%pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent
@@ -1037,6 +1047,11 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Tue May 09 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.10
+- Rebuild for new ECF
+- Obsolete core NLS package
+- Fix cycle introduced between tests and contributor-tools
+
* Sat May 06 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.9
- Fix build against new felix-gogo
- Update to latest I-build
commit 79166a39a6fd59a7ad8a8cc5ce97a001c6633288
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Sun May 7 23:27:32 2017 +0100
Fix build against new felix-gogo
Update to latest I-build
diff --git a/eclipse.spec b/eclipse.spec
index acd539f..7bef190 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -465,14 +465,12 @@ for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt
if [ -n "$module" ] ; then
%pom_disable_module bundles/$b eclipse.platform.swt.binaries
%pom_xpath_inject "pom:excludes" "<plugin id='$b'/>" eclipse.platform.ui/features/org.eclipse.e4.rcp
- %pom_xpath_remove "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
fi
done
for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do
module=$(grep ">bundles/$b<" rt.equinox.framework/pom.xml || :)
if [ -n "$module" ] ; then
%pom_disable_module bundles/$b rt.equinox.framework
- %pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
%pom_xpath_remove -f "plugin[@id='$b']" rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
fi
done
@@ -482,13 +480,11 @@ for b in `(cd rt.equinox.bundles/bundles && ls -d *{macosx,win32,linux}*) | grep
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}$)'` ; 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 -f "plugin[@id='$b']" eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
%pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml
fi
done
@@ -507,6 +503,11 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
%pom_xpath_remove -f "plugin[@os='macosx']" $f
%pom_xpath_remove -f "plugin[@os='win32']" $f
%pom_xpath_remove -f "plugin[@ws='win32']" $f
+ for arch in x86 x86_64 arm aarch64 ppc64 ppc64le s390x ; do
+ if [ "$arch" != "%{eclipse_arch}" ] ; then
+ %pom_xpath_remove -f "plugin[@arch='$arch']" $f
+ fi
+ done
done
# We don't need SWT fragments since we only care for current arch
commit 0c31782d18784270e14eba97a607076bdff4267f
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Sun May 7 13:48:00 2017 +0100
Fix build against new felix-gogo
Update to latest I-build
diff --git a/eclipse-hide-droplets-from-install-wizard.patch b/eclipse-hide-droplets-from-install-wizard.patch
index 9de6347..12f2c04 100644
--- a/eclipse-hide-droplets-from-install-wizard.patch
+++ b/eclipse-hide-droplets-from-install-wizard.patch
@@ -24,7 +24,7 @@ index 8d08101..59567c0 100644
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.ui.*;
import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
-@@ -325,6 +326,19 @@ public class RepositorySelectionGroup {
+@@ -322,6 +323,19 @@ public class RepositorySelectionGroup {
void fillRepoCombo(final String selection) {
RepositoryTracker tracker = ui.getRepositoryTracker();
URI[] sites = tracker.getKnownRepositories(ui.getSession());
@@ -51,7 +51,7 @@ index c0f2ca1..03515c7 100644
@@ -132,9 +132,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
if (cachedElements == null) {
Object[] children = super.fetchChildren(o, monitor);
- cachedElements = new Hashtable<String, MetadataRepositoryElement>(children.length);
+ cachedElements = new Hashtable<>(children.length);
+ String fragments = System.getProperty("p2.fragments");
for (int i = 0; i < children.length; i++) {
if (children[i] instanceof MetadataRepositoryElement) {
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 08298f4..44012ab 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -2,7 +2,7 @@ diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclip
index 7e1f520..734dd10 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-@@ -410,6 +410,36 @@
+@@ -400,6 +400,36 @@
install-size="0"
version="0.0.0"
fragment="true"/>
@@ -39,7 +39,7 @@ index 7e1f520..734dd10 100644
<plugin
id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -488,6 +518,39 @@
+@@ -478,6 +508,39 @@
download-size="0"
install-size="0"
version="0.0.0"
@@ -150,13 +150,12 @@ index 7e1f520..734dd10 100644
<profile>
<id>build-native-launchers-win32.win32.x86_64</id>
<activation>
-@@ -563,9 +563,12 @@
+@@ -563,8 +563,11 @@
<copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
<fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
<include name="cocoa/macosx/x86_64/**/*"/>
+ <include name="gtk/linux/arm/**/*"/>
+ <include name="gtk/linux/aarch64/**/*"/>
- <include name="gtk/linux/ppc/**/*"/>
<include name="gtk/linux/ppc64/**/*"/>
<include name="gtk/linux/ppc64le/**/*"/>
+ <include name="gtk/linux/s390x/**/*"/>
@@ -165,7 +164,7 @@ index 7e1f520..734dd10 100644
<include name="win32/win32/x86/**/*"/>
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
-@@ -40,3 +40,12 @@
+@@ -37,3 +37,12 @@
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
@@ -180,13 +179,12 @@ index 7e1f520..734dd10 100644
+root.linux.gtk.s390x.permissions.755=launcher
--- a/eclipse.platform.swt.binaries/pom.xml 2017-04-05 01:57:59.142576722 +0100
+++ b/eclipse.platform.swt.binaries/pom.xml 2017-04-05 02:00:00.153247342 +0100
-@@ -55,9 +55,12 @@
+@@ -55,8 +55,11 @@
<modules>
<module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
- <module>bundles/org.eclipse.swt.gtk.linux.ppc</module>
<module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
@@ -195,28 +193,25 @@ index 7e1f520..734dd10 100644
<module>bundles/org.eclipse.swt.win32.win32.x86</module>
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:15:34.857977599 +0100
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100
-@@ -49,4 +49,19 @@
- requires.10.namespace = org.eclipse.equinox.p2.iu
- requires.10.name = org.eclipse.swt.cocoa.macosx.x86_64
- requires.10.range = [$version$,$version$]
--requires.10.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
-\ No newline at end of file
-+requires.10.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
+@@ -45,3 +45,18 @@
+ requires.9.name = org.eclipse.swt.gtk.linux.ppc64le
+ requires.9.range = [$version$,$version$]
+ requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
++
++requires.10.namespace = org.eclipse.equinox.p2.iu
++requires.10.name = org.eclipse.swt.gtk.linux.arm
++requires.10.range = [$version$,$version$]
++requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
+
+requires.11.namespace = org.eclipse.equinox.p2.iu
-+requires.11.name = org.eclipse.swt.gtk.linux.arm
++requires.11.name = org.eclipse.swt.gtk.linux.aarch64
+requires.11.range = [$version$,$version$]
-+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
++requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
+
+requires.12.namespace = org.eclipse.equinox.p2.iu
-+requires.12.name = org.eclipse.swt.gtk.linux.aarch64
++requires.12.name = org.eclipse.swt.gtk.linux.s390x
+requires.12.range = [$version$,$version$]
-+requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.13.namespace = org.eclipse.equinox.p2.iu
-+requires.13.name = org.eclipse.swt.gtk.linux.s390x
-+requires.13.range = [$version$,$version$]
-+requires.13.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
++requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-19 13:31:15.000000000 +0100
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100
@@ -127,7 +127,7 @@
diff --git a/eclipse.spec b/eclipse.spec
index b949d1e..acd539f 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,7 +6,7 @@
Epoch: 1
%global eb_commit 8cc50cb75de7aa0d972af59c5dd74b34d793a74e
-%global eclipse_tag I20170426-2000
+%global eclipse_tag I20170505-2000
%global _jetty_version 9.4.3
%global _lucene_version 6.1.0
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -163,8 +163,9 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-jxpath
BuildRequires: apache-commons-fileupload
-BuildRequires: osgi(org.apache.felix.gogo.shell)
-BuildRequires: osgi(org.apache.felix.gogo.command)
+BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.0.0
+BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2
+BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.0.4
BuildRequires: osgi(org.apache.felix.scr) >= 2.0.8
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
@@ -253,8 +254,9 @@ Requires: apache-commons-el >= 1.0-23
Requires: apache-commons-logging
Requires: apache-commons-codec
Requires: apache-commons-jxpath
-Requires: osgi(org.apache.felix.gogo.shell)
-Requires: osgi(org.apache.felix.gogo.command)
+Requires: osgi(org.apache.felix.gogo.shell) >= 1.0.0
+Requires: osgi(org.apache.felix.gogo.command) >= 1.0.2
+Requires: osgi(org.apache.felix.gogo.runtime) >= 1.0.4
Requires: osgi(org.apache.felix.scr) >= 2.0.8
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
@@ -578,7 +580,10 @@ sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclip
# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
-sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.eclipse.equinox.http.{jetty9,servlet}/META-INF/MANIFEST.MF
+sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.eclipse.equinox.http.{jetty,servlet}/META-INF/MANIFEST.MF
+
+# Fix constraint on gogo runtime
+sed -i -e '/org.apache.felix.service.command/s/;status=provisional//' rt.equinox.bundles/bundles/org.eclipse.equinox.console{,.ssh}/META-INF/MANIFEST.MF
# Pre-compiling JSPs does not currently work
%pom_remove_plugin org.eclipse.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
@@ -1031,6 +1036,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Sat May 06 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.9
+- Fix build against new felix-gogo
+- Update to latest I-build
+
* Wed May 03 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.8
- Package missing PDE generic editor extension
diff --git a/get-eclipse.sh b/get-eclipse.sh
index b269051..7b0c411 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=I20170426-2000
+TAG=I20170505-2000
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index abd5c6d..9e013b7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (R4_platform-aggregator-I20170426-2000.tar.xz) = e79ae12e5b012c050b9fb87586c8ded234826b51052285f9d4ef5cc1953191ea79e70bb1a96871cf2827880c83b18e1665f76d5717dedea434b571ae1de89efc
SHA512 (org.eclipse.linuxtools.eclipse-build-8cc50cb75de7aa0d972af59c5dd74b34d793a74e.tar.xz) = 39ea2659e6eb5b087dc68a7cfb586e928ef3d6e3085a514197a56c3bbce9909965891e88c9263ee87e2b914f87c2b0f3c2a751c3518dff9bbf2990d4eeef9251
+SHA512 (R4_platform-aggregator-I20170505-2000.tar.xz) = 26d02b349b4a8629d77c052d5fa44be5f956c38ccc8ebc775eace8e7c1e3091c92f75eb9260b7cdc587511b7a299726a7b5790a4dd8939c5baf30787ba0b8afa
commit a0f3cd3bfe06cb17e4b553b3e5cf48454d7f6a23
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Wed May 3 11:01:19 2017 +0100
Package missing PDE generic editor extension
diff --git a/eclipse.spec b/eclipse.spec
index a732753..b949d1e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,7 +1,7 @@
# Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
# generation and docs will not be built and a second run will be required, but
# this is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap 1
+%global bootstrap 0
Epoch: 1
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.7%{?dist}
+Release: 0.8%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -620,7 +620,7 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
%mvn_package ":org.eclipse.ant.optional.junit" contributor-tools
%mvn_package "org.eclipse.cvs{,.feature}:" cvs
%mvn_package "org.eclipse.team:org.eclipse.team.cvs*" cvs
-%mvn_package "org.eclipse.pde{,.feature}:" pde
+%mvn_package "org.eclipse.pde{,.ui,.feature}:" pde
%mvn_package "org.eclipse.ui:org.eclipse.ui.{views.log,trace}" pde
%mvn_package "org.eclipse.sdk{,.feature}:" sdk
%mvn_package ":" __noinstall
@@ -1031,6 +1031,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Wed May 03 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.8
+- Package missing PDE generic editor extension
+
* Tue May 02 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.7
- Rebuild for s390x
- Don't require JDK directly
commit af433962405e798fc65255db7321365b18bb2dcf
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Tue May 2 15:44:39 2017 +0100
Enable bootstrap mode
diff --git a/eclipse.spec b/eclipse.spec
index d307db3..a732753 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,7 +1,7 @@
# Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
# generation and docs will not be built and a second run will be required, but
# this is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap 0
+%global bootstrap 1
Epoch: 1
commit 6db7b846d4c70f01a38f49b450da686adcc23a25
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Tue May 2 12:34:09 2017 +0100
Rebuild for s390x
Don't require JDK directly
diff --git a/eclipse.spec b/eclipse.spec
index 55b31dc..d307db3 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch: 1
%ifarch ppc64 ppc64p7
%global eclipse_arch ppc64
%endif
-%ifarch s390 s390x x86_64 aarch64 ppc64le
+%ifarch s390x x86_64 aarch64 ppc64le
%global eclipse_arch %{_arch}
%endif
@@ -123,6 +123,7 @@ Patch29: fix_ant_build.patch
# Hide the p2 Droplets from cluttering Install Wizard Combo
Patch30: eclipse-hide-droplets-from-install-wizard.patch
+BuildRequires: maven-local
BuildRequires: tycho >= 0.25.0
BuildRequires: tycho-extras >= 0.25.0
BuildRequires: cbi-plugins
@@ -135,7 +136,6 @@ BuildRequires: rsync
BuildRequires: make, gcc
BuildRequires: zip, unzip
BuildRequires: desktop-file-utils
-BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(nspr)
@@ -153,7 +153,8 @@ BuildRequires: pkgconfig(webkitgtk-3.0)
%else
BuildRequires: pkgconfig(webkit2gtk-4.0)
%endif
-BuildRequires: icu4j >= 1:54.1.1-2
+BuildRequires: icu4j >= 1:58.2
+BuildRequires: ant >= 1.10.1
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
BuildRequires: jsch >= 0:0.1.46-2
@@ -181,7 +182,7 @@ BuildRequires: junit >= 4.12
BuildRequires: hamcrest >= 1.3
BuildRequires: sat4j >= 2.3.5-1
BuildRequires: objectweb-asm >= 5.0.3-1
-BuildRequires: sac >= 1.3-12
+BuildRequires: sac
BuildRequires: batik-css
BuildRequires: xml-commons-apis
BuildRequires: atinject
@@ -268,7 +269,7 @@ Requires: lucene-analysis >= %{_lucene_version}
Requires: lucene-queryparser >= %{_lucene_version}
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
Requires: sat4j >= 2.3.5-1
-Requires: sac >= 1.3-12
+Requires: sac
Requires: batik-css
Requires: xml-commons-apis
Requires: atinject
@@ -279,7 +280,7 @@ Requires: glassfish-el >= 3.0.1
Requires: glassfish-jsp-api >= 2.2.1-4
Requires: glassfish-jsp >= 2.2.5
Requires: glassfish-servlet-api >= 3.1.0
-Requires: icu4j >= 1:54.1.1-2
+Requires: icu4j >= 1:58.2
Requires: %{name}-swt = %{epoch}:%{version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
Requires: httpcomponents-core
@@ -1032,6 +1033,7 @@ fi
%changelog
* Tue May 02 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.7
- Rebuild for s390x
+- Don't require JDK directly
* Fri Apr 28 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.6
- Non-bootstrap build
commit 1d99f9976703050e208e0d5ae261715db7dd922b
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Tue May 2 09:57:42 2017 +0100
Rebuild for s390x
diff --git a/eclipse.spec b/eclipse.spec
index 30d10e7..55b31dc 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -1030,6 +1030,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Tue May 02 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.7
+- Rebuild for s390x
+
* Fri Apr 28 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.6
- Non-bootstrap build
commit e12344b17b6689522822af7e2293cf9bd154543d
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Fri Apr 28 13:58:16 2017 +0100
Non-bootstrap build
diff --git a/eclipse-fix-tests.patch b/eclipse-fix-tests.patch
index 82cfc90..ec8d07b 100644
--- a/eclipse-fix-tests.patch
+++ b/eclipse-fix-tests.patch
@@ -273,3 +273,19 @@ index bc8963d..fbe4da3 100644
+ </plugins>
+ </build>
</project>
+--- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig 2017-04-28 11:49:47.046123546 +0100
++++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28 12:05:11.947521737 +0100
+@@ -157,13 +157,6 @@
+ id="org.eclipse.jdt.source.feature.group"
+ version="" />
+ <iu
+- id="org.eclipse.rcp.configuration.feature.group"
+- version="" />
+-
+- <iu
+- id="org.eclipse.equinox.executable"
+- version="" />
+- <iu
+ id="org.eclipse.e4.rcp.feature.group"
+ version="" />
+ <iu
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 841da1b..494acf2 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -103,6 +103,24 @@
<exec
dir="${platformLocation}"
executable="tar">
+@@ -561,7 +534,7 @@
+ unless="currentUpdateSite">
+ <property
+ name="currentUpdateSite"
+- value="http://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" />
++ value="file:${repoLocation}" />
+ </target>
+ <target
+ name="initStreamSpecificProperties"
+@@ -808,7 +781,7 @@
+
+ <target
+ name="init"
+- depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive"
++ depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initBasicDirectories, initCurrentUpdateSite, initOSes, initPlatformArhiveName, setRuntimeArchive"
+ unless="testingIsInitialized">
+
+ <property environment="env" />
@@ -823,7 +796,7 @@
<property
diff --git a/eclipse.spec b/eclipse.spec
index d6f9fe1..30d10e7 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,7 +1,7 @@
# Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
# generation and docs will not be built and a second run will be required, but
# this is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap 1
+%global bootstrap 0
Epoch: 1
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -544,8 +544,7 @@ sed -i -e '/<\/excludes>/i<plugin id="org.eclipse.jdt.core.compiler.batch"/>' \
%pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent
# Don't set perms on files for platforms that aren't linux
-for f in \
- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
+for f in rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp
sed -i -e '/^root\./d' $f && cat tmp >> $f
done
@@ -1031,6 +1030,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Fri Apr 28 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.6
+- Non-bootstrap build
+
* Tue Apr 25 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.5
- Update to latest I-build
- Update generated ant bundle to 1.10.1
commit 74c26cc00aa575f60fcecd4e6b9db09fee6fc9e1
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu Apr 27 14:19:53 2017 +0100
Update to latest I-build
Update generated ant bundle to 1.10.1
Fix missing launcher bundle on s390, rhbz#1445162
Add missing BR on libsecret
diff --git a/disable-non-linux.patch b/disable-non-linux.patch
deleted file mode 100644
index 9a6dc64..0000000
--- a/disable-non-linux.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.sav 2015-06-10 10:05:23.943730974 +0300
-+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2015-06-10 10:05:50.820612421 +0300
-@@ -166,22 +166,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jdt.launching.macosx"
-- os="macosx"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jdt.launching.ui.macosx"
-- os="macosx"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.ant.launching"
- download-size="0"
- install-size="0"
---- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml.sav 2015-06-10 12:56:37.342595242 +0300
-+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 2015-06-10 12:57:16.684444749 +0300
-@@ -176,35 +176,6 @@
- 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.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.tukaani.xz"
- download-size="0"
- install-size="0"
---- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.sav 2015-06-10 14:12:33.862436725 +0300
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2015-06-10 14:14:04.642140750 +0300
-@@ -137,16 +137,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"
-- os="macosx"
-- ws="cocoa"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- fragment="true"
-- unpack="false"/>
--
-- <plugin
- 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"
-@@ -359,15 +351,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.linux.x86"
- os="linux"
- arch="x86"
-@@ -439,26 +402,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"
-@@ -534,35 +477,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"
diff --git a/eclipse-fix-startup-class-refresh.patch b/eclipse-fix-startup-class-refresh.patch
index 36c1404..6a07388 100644
--- a/eclipse-fix-startup-class-refresh.patch
+++ b/eclipse-fix-startup-class-refresh.patch
@@ -1,6 +1,6 @@
--- 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
-@@ -35,3 +35,4 @@
+@@ -34,3 +34,4 @@
Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
index a53f741..d7f796e 100644
--- a/eclipse-mockito.patch
+++ b/eclipse-mockito.patch
@@ -35,9 +35,9 @@
- org.mockito;bundle-version="1.8.4",
+ org.hamcrest.core,
+ org.mockito.mockito-core,
- org.eclipse.equinox.preferences;bundle-version="3.5.200"
+ org.eclipse.equinox.preferences;bundle-version="3.5.200",
+ org.eclipse.ui.forms
Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: JavaSE-1.8
--- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig 2017-04-04 17:30:21.859313175 +0100
+++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml 2017-04-04 17:30:47.748038958 +0100
@@ -75,7 +75,7 @@
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index a8d3e54..d20812d 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -59,12 +59,10 @@
</configuration>
--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100
+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100
-@@ -57,6 +57,10 @@
+@@ -57,6 +57,8 @@
<excludes>
<plugin id="org.eclipse.jdt"/>
<plugin id="org.eclipse.jdt.doc.user"/>
-+ <plugin id="org.eclipse.jdt.launching.macosx" />
-+ <plugin id="org.eclipse.jdt.launching.ui.macosx" />
+ <plugin id="org.junit" />
+ <plugin id="org.hamcrest.core" />
</excludes>
@@ -72,53 +70,24 @@
</execution>
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
-@@ -73,6 +73,13 @@
+@@ -73,6 +73,8 @@
<plugin id="org.eclipse.core.net.linux.x86_64"/>
<plugin id="org.eclipse.core.net.win32.x86"/>
<plugin id="org.eclipse.core.net.win32.x86_64"/>
-+ <plugin id="org.eclipse.equinox.security.macosx"/>
-+ <plugin id="org.eclipse.equinox.security.win32.x86"/>
-+ <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
-+ <plugin id="org.eclipse.compare.win32"/>
-+ <plugin id="org.eclipse.ui.win32"/>
+ <plugin id="com.jcraft.jsch"/>
+ <plugin id="org.apache.ant"/>
</excludes>
</configuration>
</execution>
---- eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml.orig 2014-04-23 15:44:51.755422154 +0100
-+++ eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml 2014-04-23 15:45:22.730893380 +0100
-@@ -39,11 +39,9 @@
- <features>
- <feature id="org.eclipse.sdk.examples"/>
- </features>
-- <!--
- <excludes>
-- <plugin id="org.eclipse.sdk.examples"/>
-+ <plugin id="org.eclipse.swt.examples.ole.win32"/>
- </excludes>
-- -->
- </configuration>
- </execution>
- </executions>
---- eclipse.platform.releng/features/org.eclipse.rcp/pom.xml.orig 2014-04-28 16:08:27.781454042 +0100
-+++ eclipse.platform.releng/features/org.eclipse.rcp/pom.xml 2014-04-28 16:08:55.067988282 +0100
-@@ -37,6 +37,7 @@
- <configuration>
- <excludes>
- <plugin id="org.eclipse.rcp"/>
-+ <plugin id="org.eclipse.ui.cocoa"/>
- </excludes>
- </configuration>
- </execution>
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
-@@ -46,6 +46,20 @@
+@@ -46,6 +46,21 @@
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
++ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
+ <plugin id="org.apache.commons.jxpath" />
+ <plugin id="org.apache.felix.gogo.command" />
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 7ec16e5..08298f4 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -2,7 +2,7 @@ diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclip
index 7e1f520..734dd10 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-@@ -423,6 +423,26 @@
+@@ -410,6 +410,36 @@
install-size="0"
version="0.0.0"
fragment="true"/>
@@ -26,13 +26,25 @@ index 7e1f520..734dd10 100644
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
++
++ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.s390x"
++ os="linux"
++ ws="gtk"
++ arch="s390x"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
<plugin
id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -597,6 +627,39 @@
+@@ -488,6 +518,39 @@
+ download-size="0"
+ install-size="0"
version="0.0.0"
- fragment="true"
- unpack="false"/>
++ fragment="true"
++ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.s390x"
@@ -64,11 +76,9 @@ index 7e1f520..734dd10 100644
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
-+ fragment="true"
-+ unpack="false"/>
+ fragment="true"
+ unpack="false"/>
- <plugin
- id="org.eclipse.swt.gtk.linux.ppc"
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000
@@ -349,6 +349,68 @@
@@ -218,3 +228,24 @@ index 7e1f520..734dd10 100644
defaultOSArch="arm"
defaultJava=DEFAULT_JAVA_EXEC
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+--- a/rt.equinox.framework/pom.xml 2017-04-26 22:19:15.548461372 +0100
++++ b/rt.equinox.framework/pom.xml 2017-04-26 22:20:41.348571492 +0100
+@@ -73,6 +73,18 @@
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
+ </modules>
+ </profile>
++ <profile>
++ <id>build-native-launchers-gtk.linux.s390x</id>
++ <activation>
++ <property>
++ <name>native</name>
++ <value>gtk.linux.s390x</value>
++ </property>
++ </activation>
++ <modules>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
++ </modules>
++ </profile>
+ </profiles>
+
+ <modules>
diff --git a/eclipse.spec b/eclipse.spec
index dcc997a..d6f9fe1 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -5,8 +5,8 @@
Epoch: 1
-%global eb_commit 31070399d9e0224c8e6deda2ad12cfee7a70dcf3
-%global eclipse_tag I20170417-2000
+%global eb_commit 8cc50cb75de7aa0d972af59c5dd74b34d793a74e
+%global eclipse_tag I20170426-2000
%global _jetty_version 9.4.3
%global _lucene_version 6.1.0
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -97,9 +97,6 @@ Patch15: eclipse-support-symlink-bundles.patch
# org.w3c.dom.smil -> removed
Patch16: eclipse-feature-plugins-to-category-ius.patch
-# Disable non-linux specific bundles to save build time
-Patch17: disable-non-linux.patch
-
# Fix various JDT and PDE tests
Patch20: eclipse-fix-tests.patch
@@ -147,6 +144,7 @@ BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtst)
+BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
%if 0%{?rhel}
@@ -373,7 +371,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch14
%patch15
%patch16
-%patch17
%patch20
%patch21
%patch22
@@ -476,6 +473,10 @@ for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.laun
%pom_xpath_remove -f "plugin[@id='$b']" rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
fi
done
+for b in `(cd rt.equinox.bundles/bundles && ls -d *{macosx,win32,linux}*) | grep -P -e 'org.eclipse.equinox.security\.(?!linux\.%{eclipse_arch}$)'` ; do
+ %pom_disable_module bundles/$b rt.equinox.bundles
+ %pom_xpath_remove "plugin[@id='$b']" rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
+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
@@ -490,15 +491,20 @@ for b in `ls eclipse.platform.resources/bundles/ | grep -P -e 'org.eclipse.core.
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 org.eclipse.e4.ui.workbench.renderers.swt.cocoa eclipse.platform.ui/bundles
%pom_disable_module org.eclipse.ui.cocoa eclipse.platform.ui/bundles
%pom_disable_module org.eclipse.ui.win32 eclipse.platform.ui/bundles
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
+for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
+ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \
+ eclipse.platform.releng/features/org.eclipse.rcp/feature.xml \
+ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml ; do
+ %pom_xpath_remove -f "plugin[@os='macosx']" $f
+ %pom_xpath_remove -f "plugin[@os='win32']" $f
+ %pom_xpath_remove -f "plugin[@ws='win32']" $f
+done
# We don't need SWT fragments since we only care for current arch
%pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt
@@ -548,13 +554,10 @@ done
mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
# Ensure that bundles with native artifacts are dir-shaped, so no *.so is extracted into user.home
-for f in `find eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.* -name MANIFEST.MF` ; do
- echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
-done
-for f in `find eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.* -name MANIFEST.MF` ; do
- echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
-done
-for f in `find eclipse.platform.team/bundles/org.eclipse.core.net/fragments -name MANIFEST.MF` ; do
+for f in rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.*/META-INF/MANIFEST.MF \
+ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*/META-INF/MANIFEST.MF \
+ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.*/META-INF/MANIFEST.MF \
+ eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.... ; do
echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
done
@@ -567,8 +570,8 @@ xmvn -o install:install-file -Dfile=%{_root_datadir}/java/rhino.jar -Dpackaging=
popd
%endif
-#fake dependencies that don't exist in fedora
-./dependencies/fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* -makejar
+# Build fake ant bundle that contains symlinks to system jars
+dependencies/fake_ant_dependency.sh
# Allow usage of javax.servlet.jsp 2.3.
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
@@ -612,7 +615,7 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
%mvn_package ":org.eclipse.equinox.p2{,.ui}.discovery" p2-discovery
%mvn_package ":org.eclipse.e4{,.core}.tools*" contributor-tools
%mvn_package ":org.eclipse.releng.tools" contributor-tools
-%mvn_package ":org.eclipse.swt.tools{,.feature}" contributor-tools
+%mvn_package ":org.eclipse.swt.tools*" contributor-tools
%mvn_package "org.eclipse.test{,.feature}:" contributor-tools
%mvn_package ":org.eclipse.ant.optional.junit" contributor-tools
%mvn_package "org.eclipse.cvs{,.feature}:" cvs
@@ -641,7 +644,7 @@ QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
# Location that the product is materialised
product="eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}"
-#ant again
+# Re-symlink ant bundle to use system jars
dependencies/fake_ant_dependency.sh $product/eclipse/plugins/org.apache.ant_*
# Symlink necessary plugins that are provided by other packages
@@ -945,8 +948,7 @@ fi
%{_eclipsedir}/plugins/org.eclipse.equinox.p2.updatesite_*
%{_eclipsedir}/plugins/org.eclipse.equinox.preferences_*
%{_eclipsedir}/plugins/org.eclipse.equinox.registry_*
-%{_eclipsedir}/plugins/org.eclipse.equinox.security_*
-%{_eclipsedir}/plugins/org.eclipse.equinox.security.ui_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.security*
%{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator_*
%{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
%{_eclipsedir}/plugins/org.eclipse.equinox.util_*
@@ -1029,6 +1031,12 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Tue Apr 25 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.5
+- Update to latest I-build
+- Update generated ant bundle to 1.10.1
+- Fix missing launcher bundle on s390, rhbz#1445162
+- Add missing BR on libsecret
+
* Fri Apr 21 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.4
- Fix secondary arch build
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 1b46d44..b269051 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=I20170417-2000
+TAG=I20170426-2000
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index a010d4f..abd5c6d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (R4_platform-aggregator-I20170417-2000.tar.xz) = d994c6043e08d259776ac2dcdf6b1d1cc9933043e45455ccabbdafdc43e6361d1c2f43c75d0e77b67d9308426513f94786f76a619b2e68458228e023977d194e
-SHA512 (org.eclipse.linuxtools.eclipse-build-31070399d9e0224c8e6deda2ad12cfee7a70dcf3.tar.xz) = 1f12d0e66385c14996ff370b28098df6af8e241fb1b4e1fe18dd9f1df2ed74974be5b812b9e07ea4e3ff7f5df9d0d2bf71e8ddfb2e2aaf74b0cd5d6d84fef470
+SHA512 (R4_platform-aggregator-I20170426-2000.tar.xz) = e79ae12e5b012c050b9fb87586c8ded234826b51052285f9d4ef5cc1953191ea79e70bb1a96871cf2827880c83b18e1665f76d5717dedea434b571ae1de89efc
+SHA512 (org.eclipse.linuxtools.eclipse-build-8cc50cb75de7aa0d972af59c5dd74b34d793a74e.tar.xz) = 39ea2659e6eb5b087dc68a7cfb586e928ef3d6e3085a514197a56c3bbce9909965891e88c9263ee87e2b914f87c2b0f3c2a751c3518dff9bbf2990d4eeef9251
commit 704905cea28709294da48246381a4d48843f8156
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Mon Apr 24 09:33:29 2017 +0100
Fix patch formatting
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index c5270e9..7ec16e5 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -207,8 +207,8 @@ index 7e1f520..734dd10 100644
+requires.13.name = org.eclipse.swt.gtk.linux.s390x
+requires.13.range = [$version$,$version$]
+requires.13.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh.orig 2017-04-19 13:31:15.000000000 +0100
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-19 13:31:15.000000000 +0100
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100
@@ -127,7 +127,7 @@
defaultJava=DEFAULT_JAVA_EXEC
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
commit a33980e58dcd8775b8edbe9d8f29a88c59d5bd71
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Sun Apr 23 17:00:01 2017 +0100
Fix quoting when detecting 32bit arm
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 7994563..c5270e9 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -207,3 +207,14 @@ index 7e1f520..734dd10 100644
+requires.13.name = org.eclipse.swt.gtk.linux.s390x
+requires.13.range = [$version$,$version$]
+requires.13.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
+--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh.orig 2017-04-19 13:31:15.000000000 +0100
++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100
+@@ -127,7 +127,7 @@
+ defaultJava=DEFAULT_JAVA_EXEC
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ ;;
+- "arm*")
++ arm*)
+ defaultOSArch="arm"
+ defaultJava=DEFAULT_JAVA_EXEC
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
commit 46cd6ace8d432d3a2c7854c711180142c5c1a17b
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Fri Apr 21 11:48:33 2017 +0100
Fix secondary arch launcher build
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 400a9d2..7994563 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -140,6 +140,19 @@ index 7e1f520..734dd10 100644
<profile>
<id>build-native-launchers-win32.win32.x86_64</id>
<activation>
+@@ -563,9 +563,12 @@
+ <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
+ <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
+ <include name="cocoa/macosx/x86_64/**/*"/>
++ <include name="gtk/linux/arm/**/*"/>
++ <include name="gtk/linux/aarch64/**/*"/>
+ <include name="gtk/linux/ppc/**/*"/>
+ <include name="gtk/linux/ppc64/**/*"/>
+ <include name="gtk/linux/ppc64le/**/*"/>
++ <include name="gtk/linux/s390x/**/*"/>
+ <include name="gtk/linux/x86/**/*"/>
+ <include name="gtk/linux/x86_64/**/*"/>
+ <include name="win32/win32/x86/**/*"/>
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
@@ -40,3 +40,12 @@
commit 8ae0eb0553406ae2b73e888408b6bc191535edc3
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Fri Apr 21 10:34:28 2017 +0100
Fix patch formatting
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 980b219..400a9d2 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -170,8 +170,8 @@ index 7e1f520..734dd10 100644
<module>bundles/org.eclipse.swt.gtk.linux.x86</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
<module>bundles/org.eclipse.swt.win32.win32.x86</module>
---- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf.orig 2017-04-21 10:15:34.857977599 +0100
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:15:34.857977599 +0100
++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100
@@ -49,4 +49,19 @@
requires.10.namespace = org.eclipse.equinox.p2.iu
requires.10.name = org.eclipse.swt.cocoa.macosx.x86_64
commit 908a2dcc66b003fc5ffeff5caeaa1dbf81e9b8df
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Fri Apr 21 10:22:32 2017 +0100
Fix secondary arch build
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 703e6c8..980b219 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -170,3 +170,27 @@ index 7e1f520..734dd10 100644
<module>bundles/org.eclipse.swt.gtk.linux.x86</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
<module>bundles/org.eclipse.swt.win32.win32.x86</module>
+--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf.orig 2017-04-21 10:15:34.857977599 +0100
++++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100
+@@ -49,4 +49,19 @@
+ requires.10.namespace = org.eclipse.equinox.p2.iu
+ requires.10.name = org.eclipse.swt.cocoa.macosx.x86_64
+ requires.10.range = [$version$,$version$]
+-requires.10.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
+\ No newline at end of file
++requires.10.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
++
++requires.11.namespace = org.eclipse.equinox.p2.iu
++requires.11.name = org.eclipse.swt.gtk.linux.arm
++requires.11.range = [$version$,$version$]
++requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
++
++requires.12.namespace = org.eclipse.equinox.p2.iu
++requires.12.name = org.eclipse.swt.gtk.linux.aarch64
++requires.12.range = [$version$,$version$]
++requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
++
++requires.13.namespace = org.eclipse.equinox.p2.iu
++requires.13.name = org.eclipse.swt.gtk.linux.s390x
++requires.13.range = [$version$,$version$]
++requires.13.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
diff --git a/eclipse.spec b/eclipse.spec
index bf070c3..dcc997a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -548,14 +548,14 @@ done
mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
# Ensure that bundles with native artifacts are dir-shaped, so no *.so is extracted into user.home
-for f in `find eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.* -name MANIFEST.MF` ; do
- echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
+for f in `find eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.* -name MANIFEST.MF` ; do
+ echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
done
-for f in `find eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.* -name MANIFEST.MF` ; do
- echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
+for f in `find eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.* -name MANIFEST.MF` ; do
+ echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
done
-for f in `find eclipse.platform.team/bundles/org.eclipse.core.net/fragments -name MANIFEST.MF` ; do
- echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
+for f in `find eclipse.platform.team/bundles/org.eclipse.core.net/fragments -name MANIFEST.MF` ; do
+ echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
done
%if 0%{?rhel}
@@ -1029,6 +1029,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Fri Apr 21 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.4
+- Fix secondary arch build
+
* Thu Apr 20 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.3
- Simplify test installation and move machinery out of javadir now
that java stuff is installed in its own place
commit d859489be8b02d6d7fcd2d5d93f6030f88800743
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu Apr 20 22:48:33 2017 +0100
Simplify test installation and move machinery out of javadir now
that java stuff is installed in its own place
Enable bootstrap mode
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 26976ad..841da1b 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -1,5 +1,5 @@
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2017-03-06 14:35:07.000000000 +0000
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2017-03-07 15:30:44.993586317 +0000
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2017-04-19 12:47:51.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2017-04-19 20:15:38.781348810 +0100
@@ -39,21 +39,6 @@
arg1="${testPlugin}"
arg2="org.eclipse.equinox.p2.tests.discovery" />
@@ -112,10 +112,30 @@
<echo message="current.build.repo: ${current.build.repo}" />
-@@ -2017,6 +1990,15 @@
+@@ -1902,6 +1875,7 @@
+ -->
<antcall target="quickTests" />
<antcall target="longRunningTests" />
++ <antcall target="mergeAllTestResults" />
+ </target>
+
+@@ -1963,6 +1937,8 @@
+ <antcall target="jdttext" />
+ <antcall target="jdtuirefactoring" />
+ </target>
++ <target name="distroCustomTests" depends="init">
++ </target>
+ <target
+ name="quickTests"
+ depends="init">
+@@ -2072,6 +2048,20 @@
+
+ </target>
+
++ <target
++ name="mergeAllTestResults"
++ depends="init">
+ <!-- Split XML into individual test suites for generating an aggregate report -->
+ <mkdir dir="${results}/split-xml" />
+ <xslt style="${executionDir}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/split-xml"/>
@@ -125,10 +145,12 @@
+ </junitreport>
+ <!-- Generate top-level HTML report -->
+ <xslt style="${executionDir}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
- </target>
-
- <!-- This and all the performance specific targets
-@@ -2194,8 +2176,6 @@
++ </target>
++
+ <!--
+ admittedly, not quite all of 'platform', but for
+ now serves dual purpose of a "short set" of tests, that area
+@@ -2080,8 +2070,6 @@
<target
name="platform"
depends="init">
@@ -137,7 +159,7 @@
<antcall target="ant" />
<antcall target="antui" />
-@@ -2227,7 +2207,6 @@
+@@ -2114,7 +2102,6 @@
<antcall target="e4CssSwt" />
<antcall target="e4UI" />
<antcall target="equinoxds" />
@@ -145,7 +167,7 @@
<antcall target="bidi" />
<antcall target="ltkuirefactoringtests" />
<antcall target="ltkcorerefactoringtests" />
-@@ -2243,7 +2222,6 @@
+@@ -2130,7 +2117,6 @@
<antcall target="osgi" />
<antcall target="coreresources" />
<antcall target="equinoxp2" />
@@ -224,3 +246,57 @@
-
+cleanupXvnc
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml.orig 2017-04-19 19:39:39.382960089 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml 2017-04-19 20:04:36.088575077 +0100
+@@ -137,6 +137,15 @@
+ <property
+ name="formatter"
+ value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
++ <!-- default product/application to launch -->
++ <condition property="testproduct.if.available" value="-product ${testProduct}">
++ <isset property="testProduct" />
++ </condition>
++ <property name="testproduct.if.available" value="" />
++ <condition property="testapplication.if.available" value="-testApplication ${testApplication}">
++ <isset property="testApplication" />
++ </condition>
++ <property name="testapplication.if.available" value="" />
+
+ <tstamp prefix="NOW" />
+ <property
+@@ -196,6 +205,17 @@
+ </target>
+
+ <target
++ name="swtbot-test"
++ description="Eclipse application used to launch SWTBOT plugin tests."
++ depends="init">
++ <antcall target="${launchTarget}">
++ <param
++ name="application"
++ value="org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication" />
++ </antcall>
++ </target>
++
++ <target
+ name="java-test"
+ depends="init">
+ <echo
+@@ -258,7 +278,7 @@
+ <include name="org.eclipse.equinox.launcher_*.jar" />
+ </fileset>
+ </classpath>
+- <arg line="-application ${application}" />
++ <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />
+ <arg line="-data ${data-dir}" />
+ <arg line="formatter=${formatter},${test-output}" />
+ <arg line="-testPluginName ${plugin-name}" />
+@@ -329,7 +349,7 @@
+ output="${junit-report-output}/${classname}.txt">
+ <arg line="-data ${data-dir}" />
+ <arg line="${test-vm}" />
+- <arg line="-application ${application}" />
++ <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />
+ <arg line="formatter=${formatter},${test-output}" />
+ <arg line="-testPluginName ${plugin-name}" />
+ <arg line="-className ${classname}" />
diff --git a/eclipse.spec b/eclipse.spec
index f13d1e0..bf070c3 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,11 +1,11 @@
# Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
# generation and docs will not be built and a second run will be required, but
# this is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap 0
+%global bootstrap 1
Epoch: 1
-%global eb_commit 4bb6dae1336990aa3fe29be55f99869f091f6e44
+%global eb_commit 31070399d9e0224c8e6deda2ad12cfee7a70dcf3
%global eclipse_tag I20170417-2000
%global _jetty_version 9.4.3
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -349,7 +349,6 @@ SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks.
%package tests
Summary: Eclipse Tests
-Requires: %{name}-pde = %{epoch}:%{version}-%{release}
Requires: %{name}-contributor-tools = %{epoch}:%{version}-%{release}
%description tests
@@ -526,14 +525,6 @@ sed -i -e '/org.eclipse.ui.themes/i<plugin id="org.eclipse.jdt.core.compiler.bat
sed -i -e '/<\/excludes>/i<plugin id="org.eclipse.jdt.core.compiler.batch"/>' \
eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
-# Don't duplicate the test framework bundles
-%pom_remove_plugin org.eclipse.tycho.extras:tycho-p2-extras-plugin \
- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests
-%pom_xpath_remove "includes[@id='org.eclipse.test']" \
- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
-sed -i -e '/org.eclipse.test/d' \
- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
-
# Remove uneeded hamcrest bundles
%pom_xpath_remove "plugin[@id='org.hamcrest']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
%pom_xpath_remove "plugin[@id='org.hamcrest.text']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
@@ -604,12 +595,14 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
# The order of these mvn_package calls is important
%mvn_package "::pom::" __noinstall
-%mvn_package ":*tests*" __noinstall
-%mvn_package ":org.eclipse.{e4.ui.workbench.addons.swt,equinox.frameworkadmin}.test" __noinstall
-%mvn_package ":*examples*" __noinstall
-%mvn_package ":org.eclipse.pde.tools.versioning" __noinstall
-%mvn_package ":org.eclipse.update.core" __noinstall
+%mvn_package ":*tests*" tests
+%mvn_package ":org.eclipse.equinox.frameworkadmin.test" tests
+%mvn_package ":org.eclipse.equinox.p2.installer" tests
+%mvn_package ":org.eclipse.jface.examples.databinding" tests
+%mvn_package ":org.eclipse.pde.tools.versioning" tests
+%mvn_package ":org.eclipse.update.core" tests
%mvn_package "org.eclipse.test:org.eclipse.test" contributor-tools
+%mvn_package ":*examples*" __noinstall
%mvn_package "::jar:sources{,-feature}:" sdk
%mvn_package ":org.eclipse.jdt.doc.isv" sdk
%mvn_package ":org.eclipse.platform.doc.isv" sdk
@@ -796,29 +789,18 @@ done
VER=$(echo $RPM_BUILD_ROOT%{_eclipsedir}/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/")
%add_maven_depmap org.eclipse.swt:org.eclipse.swt:$VER swt.jar -a org.eclipse.swt:swt -f swt
-##############
-# Tests
-##############
-
-# Since Tycho 0.22.0 resources get copied into generated eclipse-repository.
-# We place some content in ${project.build.directory} and use that to place
-# it into some other assembled zip.
-# With 0.22.0 it will get placed also into the eclipse-repository zip.
-# Let's just exclude label.properties, and equinoxp2test.properties from
-# the second extraction to avoid the issue entirely.
-
+# Tests framework
unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip \
- -d $RPM_BUILD_ROOT/%{_javadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh
-unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing -x label.properties equinoxp2tests.properties
-cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
-rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
+ -d $RPM_BUILD_ROOT/%{_datadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh
+cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing
+rm $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/eclipse-junit-tests-*.zip
# These properties are not correct and nested properties won't get resolved
-sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/equinoxp2tests.properties
+sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/equinoxp2tests.properties
# Package testbundle-to-eclipse-test
-cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
-mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
+cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle
+mv $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
#fix so permissions
find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \;
@@ -1036,9 +1018,9 @@ fi
%files contributor-tools -f .mfiles-contributor-tools
-%files tests
+%files tests -f .mfiles-tests
%{_bindir}/eclipse-runTestBundles
-%{_datadir}/java/eclipse-testing
+%{_datadir}/eclipse-testing
%files equinox-osgi -f .mfiles-equinox-osgi
%{_eclipsedir}/plugins/org.eclipse.osgi_*
@@ -1047,6 +1029,11 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Thu Apr 20 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.3
+- Simplify test installation and move machinery out of javadir now
+ that java stuff is installed in its own place
+- Enable bootstrap mode
+
* Wed Apr 19 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.2
- Update to latest I-build
diff --git a/sources b/sources
index 2c4fb8f..a010d4f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (R4_platform-aggregator-I20170417-2000.tar.xz) = d994c6043e08d259776ac2dcdf6b1d1cc9933043e45455ccabbdafdc43e6361d1c2f43c75d0e77b67d9308426513f94786f76a619b2e68458228e023977d194e
-SHA512 (org.eclipse.linuxtools.eclipse-build-4bb6dae1336990aa3fe29be55f99869f091f6e44.tar.xz) = bc2a3a8a3ef98688415b857cd751749d0529b4f28a4da58bbb3baf2da54806077021f6e1410484b416dd189479e9467a558ae991242329a5d96fa709216f2d16
+SHA512 (org.eclipse.linuxtools.eclipse-build-31070399d9e0224c8e6deda2ad12cfee7a70dcf3.tar.xz) = 1f12d0e66385c14996ff370b28098df6af8e241fb1b4e1fe18dd9f1df2ed74974be5b812b9e07ea4e3ff7f5df9d0d2bf71e8ddfb2e2aaf74b0cd5d6d84fef470
commit 05b20dd39f14908d8a8e55611fb90afa838368d1
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Wed Apr 19 14:52:34 2017 +0100
Update to latest I-build
diff --git a/eclipse.spec b/eclipse.spec
index f82fbdf..f13d1e0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,7 +6,7 @@
Epoch: 1
%global eb_commit 4bb6dae1336990aa3fe29be55f99869f091f6e44
-%global eclipse_tag I20170404-0245
+%global eclipse_tag I20170417-2000
%global _jetty_version 9.4.3
%global _lucene_version 6.1.0
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.0
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -1047,6 +1047,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Wed Apr 19 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.2
+- Update to latest I-build
+
* Tue Apr 04 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.1
- Update to Oxygen I-build
- Don't build unsupported GTK2 backend for SWT
diff --git a/get-eclipse.sh b/get-eclipse.sh
index b89e69d..1b46d44 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=I20170404-0245
+TAG=I20170417-2000
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index c0c3938..2c4fb8f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (R4_platform-aggregator-S4_6_3_RC4.tar.xz) = cdcca67a43b135736eac52ea260d61b50ac27f84372a4b8315db3b475ab152d55f101b3907d811367833ffb1630ffd8e9b1ae18639f5e7aa93de3c63dd33377f
-SHA512 (org.eclipse.linuxtools.eclipse-build-a8c4189f4b7af192e2295b27aef74300ac3bfce9.tar.xz) = be572ffae464f329ea2d2a9d14426853739be01027cec4946e47a29567cb398cd1bccaf7385e4560cfa8d6a7d4fede6d4e025b4b4b1203fb91e8343b75da5fdb
+SHA512 (R4_platform-aggregator-I20170417-2000.tar.xz) = d994c6043e08d259776ac2dcdf6b1d1cc9933043e45455ccabbdafdc43e6361d1c2f43c75d0e77b67d9308426513f94786f76a619b2e68458228e023977d194e
+SHA512 (org.eclipse.linuxtools.eclipse-build-4bb6dae1336990aa3fe29be55f99869f091f6e44.tar.xz) = bc2a3a8a3ef98688415b857cd751749d0529b4f28a4da58bbb3baf2da54806077021f6e1410484b416dd189479e9467a558ae991242329a5d96fa709216f2d16
commit c736234c3bcaa7bc091605ee93743fb8796c09bf
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Wed Apr 19 12:45:38 2017 +0100
Update to Oxygen I-build
Don't build unsupported GTK2 backend for SWT
Move installation to a multilib agnostic location /usr/lib
diff --git a/disable-non-linux.patch b/disable-non-linux.patch
index 87331a2..9a6dc64 100644
--- a/disable-non-linux.patch
+++ b/disable-non-linux.patch
@@ -1,6 +1,6 @@
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.sav 2015-06-10 10:05:23.943730974 +0300
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2015-06-10 10:05:50.820612421 +0300
-@@ -161,22 +161,6 @@
+@@ -166,22 +166,6 @@
unpack="false"/>
<plugin
@@ -114,7 +114,7 @@
id="org.eclipse.core.filebuffers"
download-size="0"
install-size="0"
-@@ -351,35 +343,6 @@
+@@ -359,15 +351,6 @@
unpack="false"/>
<plugin
@@ -127,29 +127,9 @@
- 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"
+ id="org.eclipse.core.filesystem.linux.x86"
+ os="linux"
+ arch="x86"
@@ -439,26 +402,6 @@
unpack="false"/>
diff --git a/eclipse-adjust-droplets.patch b/eclipse-adjust-droplets.patch
index bf88f61..f7044e5 100644
--- a/eclipse-adjust-droplets.patch
+++ b/eclipse-adjust-droplets.patch
@@ -2,7 +2,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/e
index 5fc0e73..ed7e4fa 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
-@@ -144,7 +144,20 @@ public class EngineActivator implements BundleActivator {
+@@ -147,7 +147,20 @@ public class EngineActivator implements BundleActivator {
}
continue;
}
@@ -28,7 +28,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/
index 12e4d89..77945ef 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
-@@ -156,7 +156,20 @@ public class SimpleConfiguratorUtils {
+@@ -155,7 +155,20 @@ public class SimpleConfiguratorUtils {
}
continue;
}
@@ -54,16 +54,16 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/e
index 3d7e313..debbfb8 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
-@@ -238,10 +238,11 @@ public class SurrogateProfileHandler implements ISurrogateProfileHandler {
+@@ -236,10 +236,11 @@
|| "feature".equals(cap.getName())) { //$NON-NLS-1$
featureOrBundle = true;
}
-- } else if (Boolean.TRUE.equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
+- } else if (Boolean.TRUE.equals(Boolean.valueOf(unit.getProperties().get("org.eclipse.equinox.p2.type.group")))) { //$NON-NLS-1$
- featureOrBundle = true;
}
}
-+ if (Boolean.TRUE.toString().equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
-+ featureOrBundle = true;
++ if (Boolean.TRUE.equals(Boolean.valueOf(unit.getProperties().get("org.eclipse.equinox.p2.type.group")))) { //$NON-NLS-1$
++ featureOrBundle = true;
+ }
if (featureOrBundle && !added.contains(unit)) {
added.add(unit);
diff --git a/eclipse-bug-386377.patch b/eclipse-bug-386377.patch
index c912db5..5200205 100644
--- a/eclipse-bug-386377.patch
+++ b/eclipse-bug-386377.patch
@@ -38,46 +38,6 @@
+ </profile>
+ </profiles>
</project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,37 @@
- <ws>win32</ws>
- <arch>x86_64</arch>
- </properties>
-+ <profiles>
-+ <profile>
-+ <id>build-native-launchers-win32.win32.x86_64</id>
-+ <activation>
-+ <property>
-+ <name>native</name>
-+ <value>win32.win32.x86_64</value>
-+ </property>
-+ </activation>
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version>1.7</version>
-+ <executions>
-+ <execution>
-+ <id>compile-executable-natives</id>
-+ <phase>generate-resources</phase>
-+ <configuration>
-+ <target>
-+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
-+ </target>
-+ </configuration>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ </execution>
-+ </executions>
-+ </plugin>
-+ </plugins>
-+ </build>
-+ </profile>
-+ </profiles>
- </project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig 2014-04-16 15:57:02.805249103 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2014-04-16 15:57:26.204834155 +0100
@@ -27,4 +27,37 @@
@@ -158,86 +118,6 @@
+ </profile>
+ </profiles>
</project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,37 @@
- <ws>win32</ws>
- <arch>x86</arch>
- </properties>
-+ <profiles>
-+ <profile>
-+ <id>build-native-launchers-win32.win32.x86</id>
-+ <activation>
-+ <property>
-+ <name>native</name>
-+ <value>win32.win32.x86</value>
-+ </property>
-+ </activation>
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version>1.7</version>
-+ <executions>
-+ <execution>
-+ <id>compile-executable-natives</id>
-+ <phase>generate-resources</phase>
-+ <configuration>
-+ <target>
-+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
-+ </target>
-+ </configuration>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ </execution>
-+ </executions>
-+ </plugin>
-+ </plugins>
-+ </build>
-+ </profile>
-+ </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,37 @@
- <ws>gtk</ws>
- <arch>s390</arch>
- </properties>
-+ <profiles>
-+ <profile>
-+ <id>build-native-launchers-gtk.linux.s390</id>
-+ <activation>
-+ <property>
-+ <name>native</name>
-+ <value>gtk.linux.s390</value>
-+ </property>
-+ </activation>
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version>1.7</version>
-+ <executions>
-+ <execution>
-+ <id>compile-executable-natives</id>
-+ <phase>generate-resources</phase>
-+ <configuration>
-+ <target>
-+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+ </target>
-+ </configuration>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ </execution>
-+ </executions>
-+ </plugin>
-+ </plugins>
-+ </build>
-+ </profile>
-+ </profiles>
- </project>
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2014-04-16 15:53:08.146402075 +0100
@@ -27,4 +27,37 @@
@@ -318,43 +198,3 @@
+ </profile>
+ </profiles>
</project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml 2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,37 @@
- <ws>gtk</ws>
- <arch>ppc</arch>
- </properties>
-+ <profiles>
-+ <profile>
-+ <id>build-native-launchers-gtk.linux.ppc</id>
-+ <activation>
-+ <property>
-+ <name>native</name>
-+ <value>gtk.linux.ppc</value>
-+ </property>
-+ </activation>
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <artifactId>maven-antrun-plugin</artifactId>
-+ <version>1.7</version>
-+ <executions>
-+ <execution>
-+ <id>compile-executable-natives</id>
-+ <phase>generate-resources</phase>
-+ <configuration>
-+ <target>
-+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+ </target>
-+ </configuration>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ </execution>
-+ </executions>
-+ </plugin>
-+ </plugins>
-+ </build>
-+ </profile>
-+ </profiles>
- </project>
diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch
index 5c4a70e..df2301a 100644
--- a/eclipse-debug-symbols.patch
+++ b/eclipse-debug-symbols.patch
@@ -1,27 +1,30 @@
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2014-03-12 10:43:26.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2014-03-12 14:36:44.130938292 +0000
-@@ -115,7 +115,7 @@
- WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
+@@ -121,7 +121,7 @@
+ WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-CFLAGS = -O -Wall \
+CFLAGS = -g -O -Wall \
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
- -DLINUX -DGTK \
-@@ -125,12 +125,6 @@
+ $(SWT_DEBUG) \
+@@ -133,15 +133,6 @@
${SWT_PTR_CFLAGS}
LFLAGS = -shared -fPIC ${SWT_LFLAGS}
-ifndef NO_STRIP
+- # -s = Remove all symbol table and relocation information from the executable.
+- # i.e, more efficent code, but removes debug information. Should not be used if you want to debug.
+- # https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
+- # http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbo...
- AWT_LFLAGS := $(AWT_LFLAGS) -s
- MOZILLALFLAGS := $(MOZILLALFLAGS) -s
- LFLAGS := $(LFLAGS) -s
-endif
--
+
all: make_swt make_atk make_glx make_webkit
- #
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig 2014-03-12 14:47:37.513191381 +0000
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 2014-03-12 14:47:45.672200015 +0000
@@ -48,7 +48,7 @@
diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch
index 33ca499..e8bb24d 100644
--- a/eclipse-feature-plugins-to-category-ius.patch
+++ b/eclipse-feature-plugins-to-category-ius.patch
@@ -70,7 +70,7 @@ index 88a8daa..382c5ee 100644
<plugin
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml.orig 2017-01-04 10:57:15.000000000 +0000
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2017-01-13 11:29:16.371473551 +0000
-@@ -23,62 +23,6 @@
+@@ -23,76 +23,6 @@
</license>
<plugin
@@ -116,7 +116,7 @@ index 88a8daa..382c5ee 100644
- unpack="false"/>
-
- <plugin
-- id="org.apache.lucene.analysis"
+- id="org.apache.lucene.analyzers-common"
- download-size="0"
- install-size="0"
- version="0.0.0"
@@ -130,10 +130,24 @@ index 88a8daa..382c5ee 100644
- unpack="false"/>
-
- <plugin
+- id="org.apache.lucene.analyzers-smartcn"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.lucene.misc"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
id="org.eclipse.equinox.http.jetty"
download-size="0"
install-size="0"
-@@ -135,55 +79,6 @@
+@@ -149,55 +79,6 @@
unpack="false"/>
<plugin
@@ -189,17 +203,21 @@ index 88a8daa..382c5ee 100644
id="org.eclipse.core.net"
download-size="0"
install-size="0"
-@@ -197,4 +92,21 @@
+@@ -211,4 +92,23 @@
version="0.0.0"
unpack="false"/>
-+ <requires>
-+ <import plugin="javax.el" />
-+ <import plugin="javax.servlet" />
++ <requires>
++ <import plugin="javax.el-api" />
++ <import plugin="javax.servlet-api" />
+ <import plugin="javax.servlet.jsp" />
++ <import plugin="com.sun.el.javax.el" />
+ <import plugin="org.apache.commons.logging" />
++ <import plugin="org.glassfish.web.javax.servlet.jsp" />
+ <import plugin="org.apache.lucene.analyzers-common" />
+ <import plugin="org.apache.lucene.core" />
++ <import plugin="org.apache.lucene.analyzers-smartcn" />
++ <import plugin="org.apache.lucene.misc" />
+ <import plugin="org.eclipse.jetty.continuation" />
+ <import plugin="org.eclipse.jetty.http" />
+ <import plugin="org.eclipse.jetty.io" />
@@ -207,9 +225,7 @@ index 88a8daa..382c5ee 100644
+ <import plugin="org.eclipse.jetty.server" />
+ <import plugin="org.eclipse.jetty.servlet" />
+ <import plugin="org.eclipse.jetty.util" />
-+ <import plugin="org.glassfish.web.javax.servlet.jsp" />
-+ </requires>
-+
++ </requires>
</feature>
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2017-01-13 11:29:16.362473652 +0000
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2017-01-13 11:29:16.371473551 +0000
@@ -276,7 +292,7 @@ index 88a8daa..382c5ee 100644
id="org.eclipse.e4.core.di"
download-size="0"
install-size="0"
-@@ -165,20 +109,6 @@
+@@ -165,13 +109,6 @@
unpack="false"/>
<plugin
@@ -287,14 +303,21 @@ index 88a8daa..382c5ee 100644
- unpack="false"/>
-
- <plugin
-- id="javax.xml"
+ id="org.eclipse.e4.core.di.extensions"
+ download-size="0"
+ install-size="0"
+@@ -217,13 +154,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.apache.felix.scr"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.di.extensions"
+ id="org.eclipse.equinox.ds"
download-size="0"
install-size="0"
@@ -315,13 +245,6 @@
@@ -311,7 +334,7 @@ index 88a8daa..382c5ee 100644
id="org.eclipse.equinox.preferences"
download-size="0"
install-size="0"
-@@ -757,27 +680,6 @@
+@@ -575,27 +498,6 @@
unpack="false"/>
<plugin
@@ -339,7 +362,7 @@ index 88a8daa..382c5ee 100644
id="org.eclipse.equinox.console"
download-size="0"
install-size="0"
-@@ -806,13 +708,6 @@
+@@ -624,13 +526,6 @@
unpack="false"/>
<plugin
@@ -353,28 +376,28 @@ index 88a8daa..382c5ee 100644
id="org.eclipse.e4.emf.xpath"
download-size="0"
install-size="0"
-@@ -835,4 +730,18 @@
- fragment="true"
+@@ -660,4 +555,18 @@
+ version="0.0.0"
unpack="false"/>
+ <requires>
-+ <import plugin="com.ibm.icu" />
+ <import plugin="org.apache.batik.css" />
++ <import plugin="org.w3c.css.sac" />
+ <import plugin="org.apache.batik.util" />
++ <import plugin="org.w3c.dom.svg" />
++ <import plugin="javax.inject" />
+ <import plugin="org.apache.batik.util.gui" />
-+ <import plugin="org.apache.commons.jxpath" />
++ <import plugin="org.apache.felix.scr" />
++ <import plugin="com.ibm.icu" />
+ <import plugin="org.apache.felix.gogo.command" />
+ <import plugin="org.apache.felix.gogo.runtime" />
+ <import plugin="org.apache.felix.gogo.shell" />
-+ <import plugin="org.w3c.dom.svg" />
-+ <import plugin="org.w3c.css.sac" />
-+ <import plugin="javax.inject" />
-+ <import plugin="javax.xml" />
++ <import plugin="org.apache.commons.jxpath" />
+ </requires>
</feature>
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig 2017-01-04 10:54:36.000000000 +0000
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2017-01-13 11:28:25.827041896 +0000
-@@ -61,11 +61,6 @@
+@@ -61,12 +61,7 @@
</requirement>
<requirement>
<type>eclipse-plugin</type>
@@ -383,9 +406,20 @@ index 88a8daa..382c5ee 100644
- </requirement>
- <requirement>
- <type>eclipse-plugin</type>
- <id>javax.el</id>
+- <id>javax.el</id>
++ <id>javax.el-api</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+@@ -76,7 +71,7 @@
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+- <id>javax.servlet</id>
++ <id>javax.servlet-api</id>
<versionRange>0.0.0</versionRange>
</requirement>
+ <requirement>
@@ -96,7 +91,7 @@
</requirement>
<requirement>
@@ -397,9 +431,9 @@ index 88a8daa..382c5ee 100644
<requirement>
--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF.orig 2017-02-15 10:01:24.202436806 +0000
+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF 2017-02-15 10:01:35.454301845 +0000
-@@ -38,8 +38,7 @@
- org.eclipse.e4.core.commands;bundle-version="0.10.0",
- org.eclipse.e4.ui.dialogs;bundle-version="1.0.0"
+@@ -39,8 +39,7 @@
+ org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
+ org.eclipse.e4.emf.xpath
Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
diff --git a/eclipse-fix-tests.patch b/eclipse-fix-tests.patch
index 9061d81..82cfc90 100644
--- a/eclipse-fix-tests.patch
+++ b/eclipse-fix-tests.patch
@@ -246,3 +246,30 @@ index bc8963d..fbe4da3 100644
+ }
+}
+
+--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig 2017-04-07 10:44:33.764607961 +0100
++++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml 2017-04-07 11:26:44.511961798 +0100
+@@ -26,4 +26,24 @@
+ <testClass>org.eclipse.jdt.core.tests.builder.BuilderTests</testClass>
+ <testSuite>${project.artifactId}</testSuite>
+ </properties>
++
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.eclipse.tycho</groupId>
++ <artifactId>target-platform-configuration</artifactId>
++ <configuration>
++ <dependency-resolution>
++ <extraRequirements>
++ <requirement>
++ <type>eclipse-plugin</type>
++ <id>org.eclipse.jdt.annotation</id>
++ <versionRange>0.0.0</versionRange>
++ </requirement>
++ </extraRequirements>
++ </dependency-resolution>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
+ </project>
diff --git a/eclipse-hide-droplets-from-install-wizard.patch b/eclipse-hide-droplets-from-install-wizard.patch
index 85ef057..9de6347 100644
--- a/eclipse-hide-droplets-from-install-wizard.patch
+++ b/eclipse-hide-droplets-from-install-wizard.patch
@@ -24,7 +24,7 @@ index 8d08101..59567c0 100644
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.ui.*;
import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
-@@ -314,6 +315,19 @@ public class RepositorySelectionGroup {
+@@ -325,6 +326,19 @@ public class RepositorySelectionGroup {
void fillRepoCombo(final String selection) {
RepositoryTracker tracker = ui.getRepositoryTracker();
URI[] sites = tracker.getKnownRepositories(ui.getSession());
@@ -48,7 +48,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equin
index c0f2ca1..03515c7 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
-@@ -130,9 +130,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
+@@ -132,9 +132,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
if (cachedElements == null) {
Object[] children = super.fetchChildren(o, monitor);
cachedElements = new Hashtable<String, MetadataRepositoryElement>(children.length);
diff --git a/eclipse-jetty-9.4.patch b/eclipse-jetty-9.4.patch
deleted file mode 100644
index 4754f08..0000000
--- a/eclipse-jetty-9.4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java.old 2016-06-15 10:29:35.370386868 +0100
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java 2016-06-15 10:59:31.120348432 +0100
-@@ -26,7 +26,6 @@
- import org.eclipse.equinox.http.servlet.HttpServiceMultipartServlet;
- import org.eclipse.equinox.http.servlet.HttpServiceServlet;
- import org.eclipse.jetty.server.*;
--import org.eclipse.jetty.server.session.HashSessionManager;
- import org.eclipse.jetty.server.session.SessionHandler;
- import org.eclipse.jetty.servlet.ServletContextHandler;
- import org.eclipse.jetty.servlet.ServletHolder;
-@@ -144,9 +143,9 @@
- // This servlet has no mapping as it's only used from named dispatcher
- httpContext.getServletHandler().addServlet(multiPartHolder);
-
-- SessionManager sessionManager = httpContext.getSessionHandler().getSessionManager();
-+ SessionHandler sessionHandler = httpContext.getSessionHandler();
- try {
-- sessionManager.addEventListener((HttpSessionIdListener) holder.getServlet());
-+ sessionHandler.addEventListener((HttpSessionIdListener) holder.getServlet());
- } catch (ServletException e) {
- throw new ConfigurationException(pid, e.getMessage(), e);
- }
-@@ -241,10 +240,10 @@
- contextWorkDir.mkdir();
- httpContext.setAttribute(CONTEXT_TEMPDIR, contextWorkDir);
-
-- HashSessionManager sessionManager = new HashSessionManager();
-- sessionManager.setMaxInactiveInterval(Details.getInt(dictionary, JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL, -1));
-+ SessionHandler sessionHandler = new SessionHandler();
-+ sessionHandler.setMaxInactiveInterval(Details.getInt(dictionary, JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL, -1));
-
-- httpContext.setSessionHandler(new SessionHandler(sessionManager));
-+ httpContext.setSessionHandler(sessionHandler);
-
- return httpContext;
- }
diff --git a/eclipse-lucene-5.patch b/eclipse-lucene-5.patch
deleted file mode 100644
index 0d69a3e..0000000
--- a/eclipse-lucene-5.patch
+++ /dev/null
@@ -1,1934 +0,0 @@
-From e9b5adb1d0477a50111afe5cf7736c542b7e4998 Mon Sep 17 00:00:00 2001
-From: Sopot Cela <scela(a)redhat.com>
-Date: Thu, 21 May 2015 13:48:41 +0200
-Subject: [PATCH] Bug 466829 - Upgrade platform.ua to Lucene 5.1.0
-
-Change-Id: I882188205c2c1e2cc1106108680dd4e94570a975
-Signed-off-by: Sopot Cela <scela(a)redhat.com>
----
-
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF
-index ee34c8e..e4bd703 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
-+++ b/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
-@@ -43,9 +43,11 @@
- org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",
-- org.apache.lucene.analysis;bundle-version="[3.5.0,4.0.0)",
-- org.apache.lucene.core;bundle-version="[3.5.0,4.0.0)",
-- org.eclipse.core.net;bundle-version="1.2.200"
-+ org.eclipse.core.net;bundle-version="1.2.200",
-+ org.apache.lucene.analyzers-common;bundle-version="5.1.0",
-+ org.apache.lucene.core;bundle-version="5.1.0",
-+ org.apache.lucene.queryparser;bundle-version="5.1.0",
-+ org.apache.lucene.analyzers-smartcn;bundle-version="5.1.0"
- Import-Package: com.ibm.icu.text,
- org.eclipse.equinox.http.jetty;resolution:=optional
- Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/plugin.xml b/org.eclipse.help.base/plugin.xml
-index 07a5a22..4daf3f0 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/plugin.xml
-+++ b/eclipse.platform.ua/org.eclipse.help.base/plugin.xml
-@@ -83,7 +83,7 @@
- </analyzer>
- <analyzer
- locale="zh"
-- class="org.apache.lucene.analysis.cn.ChineseAnalyzer">
-+ class="org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer">
- </analyzer>
- <analyzer
- locale="cs"
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java
-index 4ea3b21..704b0e9 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java
-@@ -7,6 +7,7 @@
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.help.internal.search;
-
-@@ -19,8 +20,9 @@
- import org.apache.lucene.analysis.fr.FrenchAnalyzer;
- import org.apache.lucene.analysis.nl.DutchAnalyzer;
- import org.apache.lucene.analysis.ru.RussianAnalyzer;
--import org.apache.lucene.util.Version;
--import org.eclipse.core.runtime.*;
-+import org.eclipse.core.runtime.CoreException;
-+import org.eclipse.core.runtime.IConfigurationElement;
-+import org.eclipse.core.runtime.IExecutableExtension;
-
- /**
- * A factory responsible for instantiating a lucene {@link Analyzer}.
-@@ -30,27 +32,26 @@
- public Analyzer create() {
- if (locale == null)
- return null;
-- Version version = Version.LUCENE_35;
- if ("pt".equals(locale)) //$NON-NLS-1$
-- return new BrazilianAnalyzer(version);
-+ return new BrazilianAnalyzer();
- if ("ja".equals(locale)) //$NON-NLS-1$
-- return new CJKAnalyzer(version);
-+ return new CJKAnalyzer();
- if ("ko".equals(locale)) //$NON-NLS-1$
-- return new CJKAnalyzer(version);
-+ return new CJKAnalyzer();
- if ("pt".equals(locale)) //$NON-NLS-1$
-- return new BrazilianAnalyzer(version);
-+ return new BrazilianAnalyzer();
- if ("cs".equals(locale)) //$NON-NLS-1$
-- return new CzechAnalyzer(version);
-+ return new CzechAnalyzer();
- if ("de".equals(locale)) //$NON-NLS-1$
-- return new GermanAnalyzer(version);
-+ return new GermanAnalyzer();
- if ("el".equals(locale)) //$NON-NLS-1$
-- return new GreekAnalyzer(version);
-+ return new GreekAnalyzer();
- if ("fr".equals(locale)) //$NON-NLS-1$
-- return new FrenchAnalyzer(version);
-+ return new FrenchAnalyzer();
- if ("nl".equals(locale)) //$NON-NLS-1$
-- return new DutchAnalyzer(version);
-+ return new DutchAnalyzer();
- if ("ru".equals(locale)) //$NON-NLS-1$
-- return new RussianAnalyzer(version);
-+ return new RussianAnalyzer();
- //unknown language
- return null;
-
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
-index a066aa4..a2183f9 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
-@@ -8,18 +8,25 @@
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Alexander Kurtakov - Bug 460787
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.help.internal.search;
--import java.io.*;
--import java.util.HashSet;
--import java.util.Set;
-+import java.util.ArrayList;
-+import java.util.List;
-
--import org.apache.lucene.analysis.*;
--import org.apache.lucene.util.Version;
-+import org.apache.lucene.analysis.Analyzer;
-+import org.apache.lucene.analysis.TokenStream;
-+import org.apache.lucene.analysis.Tokenizer;
-+import org.apache.lucene.analysis.core.StopFilter;
-+import org.apache.lucene.analysis.en.EnglishPossessiveFilter;
-+import org.apache.lucene.analysis.en.PorterStemFilter;
-+import org.apache.lucene.analysis.miscellaneous.KeywordRepeatFilter;
-+import org.apache.lucene.analysis.util.CharArraySet;
- /**
- * Lucene Analyzer for English. LowerCaseTokenizer->StopFilter->PorterStemFilter
- */
- public final class Analyzer_en extends Analyzer {
-+
- /**
- * Constructor for Analyzer_en.
- */
-@@ -27,19 +34,25 @@
- super();
- }
- /**
-- * Creates a TokenStream which tokenizes all the text in the provided
-+ * Creates a TokenStreamComponents which tokenizes all the text in the provided
- * Reader.
- */
- @Override
-- public final TokenStream tokenStream(String fieldName, Reader reader) {
-- return new PorterStemFilter(new StopFilter(Version.LUCENE_30, new LowerCaseAndDigitsTokenizer(reader), getStopWords(), false));
-+ public final TokenStreamComponents createComponents(String fieldName) {
-+ final Tokenizer source;
-+ source = new LowerCaseAndDigitsTokenizer();
-+ TokenStream result = new EnglishPossessiveFilter(source);
-+ result = new StopFilter(result, new CharArraySet(getStopWords(), false));
-+ result = new KeywordRepeatFilter(result);
-+ result = new PorterStemFilter(result);
-+ return new TokenStreamComponents(source, result);
- }
-
-- private Set<String> stopWords;
-+ private List<String> stopWords;
-
-- private Set<String> getStopWords() {
-+ private List<String> getStopWords() {
- if ( stopWords == null ) {
-- stopWords = new HashSet<>();
-+ stopWords = new ArrayList<>();
- for (int i = 0; i < STOP_WORDS.length; i++) {
- stopWords.add(STOP_WORDS[i]);
- }
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
-index 4109474..e3c8722 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
-@@ -7,22 +7,20 @@
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Alexander Kurtakov - Bug 460787
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.help.internal.search;
-
--import java.io.Reader;
- import java.util.Locale;
- import java.util.StringTokenizer;
-
--import com.ibm.icu.text.BreakIterator;
--
- import org.apache.lucene.analysis.Analyzer;
--import org.apache.lucene.analysis.LowerCaseFilter;
--import org.apache.lucene.analysis.TokenStream;
--import org.apache.lucene.util.Version;
-+import org.apache.lucene.analysis.Tokenizer;
-+import org.apache.lucene.analysis.core.LowerCaseFilter;
-+import org.eclipse.core.runtime.Platform;
- import org.eclipse.help.internal.base.HelpBasePlugin;
-
--import org.eclipse.core.runtime.Platform;
-+import com.ibm.icu.text.BreakIterator;
-
-
- /**
-@@ -84,12 +82,14 @@
- }
-
- /**
-- * Creates a TokenStream which tokenizes all the text in the provided
-+ * Creates a TokenStreamComponents which tokenizes all the text in the provided
- * Reader.
- */
- @Override
-- public final TokenStream tokenStream(String fieldName, Reader reader) {
-- return new LowerCaseFilter(Version.LUCENE_30, new WordTokenStream(fieldName, reader, locale));
-+ public final TokenStreamComponents createComponents(String fieldName) {
-+ Tokenizer source = new WordTokenStream(locale);
-+ LowerCaseFilter filter = new LowerCaseFilter(source);
-+ return new TokenStreamComponents(source, filter);
- }
-
- /**
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
-index a475688..cbb2472 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
-@@ -8,29 +8,27 @@
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Alexander Kurtakov - Bug 460787
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.help.internal.search;
-
--import java.io.*;
--
--import org.apache.lucene.analysis.*;
--import org.apache.lucene.util.Version;
-+import org.apache.lucene.analysis.util.CharTokenizer;
-
- /**
- * Tokenizer breaking words around letters or digits.
- */
- public class LowerCaseAndDigitsTokenizer extends CharTokenizer {
-
-- public LowerCaseAndDigitsTokenizer(Reader input) {
-- super(Version.LUCENE_30, input);
-+ public LowerCaseAndDigitsTokenizer() {
-+ super();
- }
- @Override
-- protected char normalize(char c) {
-+ protected int normalize(int c) {
- return Character.toLowerCase(c);
- }
-
- @Override
-- protected boolean isTokenChar(char c) {
-+ public boolean isTokenChar(int c) {
- return Character.isLetterOrDigit(c);
- }
-
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java
-index 60a545d..804bf5e 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java
-@@ -7,6 +7,7 @@
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
-
- package org.eclipse.help.internal.search;
-@@ -16,6 +17,8 @@
-
- import org.apache.lucene.document.Document;
- import org.apache.lucene.document.Field;
-+import org.apache.lucene.document.StoredField;
-+import org.apache.lucene.document.TextField;
- import org.eclipse.help.search.ISearchDocument;
-
- /**
-@@ -32,25 +35,25 @@
-
- @Override
- public void setTitle(String title) {
-- doc.add(new Field("title", title, Field.Store.NO, Field.Index.ANALYZED)); //$NON-NLS-1$
-- doc.add(new Field("exact_title", title, Field.Store.NO, Field.Index.ANALYZED)); //$NON-NLS-1$
-- doc.add(new Field("raw_title", title, Field.Store.YES, Field.Index.NO)); //$NON-NLS-1$
-+ doc.add(new TextField("title", title, Field.Store.NO)); //$NON-NLS-1$
-+ doc.add(new TextField("exact_title", title, Field.Store.NO)); //$NON-NLS-1$
-+ doc.add(new StoredField("raw_title", title)); //$NON-NLS-1$
- }
-
- @Override
- public void setSummary(String summary) {
-- doc.add(new Field("summary", summary, Field.Store.YES, Field.Index.NO)); //$NON-NLS-1$
-+ doc.add(new StoredField("summary", summary)); //$NON-NLS-1$
- }
-
- @Override
- public void addContents(String contents) {
-- doc.add(new Field("contents", new StringReader(contents))); //$NON-NLS-1$
-- doc.add(new Field("exact_contents", new StringReader(contents))); //$NON-NLS-1$
-+ doc.add(new TextField("contents", new StringReader(contents))); //$NON-NLS-1$
-+ doc.add(new TextField("exact_contents", new StringReader(contents))); //$NON-NLS-1$
- }
-
- @Override
- public void setHasFilters(boolean hasFilters) {
-- doc.add(new Field("filters", Boolean.toString(hasFilters), Field.Store.YES, Field.Index.NO)); //$NON-NLS-1$
-+ doc.add(new StoredField("filters", Boolean.toString(hasFilters))); //$NON-NLS-1$
- }
-
- public Document getDocument() {
-@@ -59,8 +62,8 @@
-
- @Override
- public void addContents(Reader contents, Reader exactContents) {
-- doc.add(new Field("contents", contents)); //$NON-NLS-1$
-- doc.add(new Field("exact_contents", exactContents)); //$NON-NLS-1$
-+ doc.add(new TextField("contents", contents)); //$NON-NLS-1$
-+ doc.add(new TextField("exact_contents", exactContents)); //$NON-NLS-1$
- }
-
- }
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
-index ca9cd67..7952c8d 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
-@@ -7,6 +7,7 @@
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.help.internal.search;
-
-@@ -150,6 +151,7 @@
- .getProperty(SearchIndex.DEPENDENCIES_KEY_ANALYZER);
- if (!targetIndex.isLuceneCompatible(lucene)
- || !targetIndex.isAnalyzerCompatible(analyzer)) {
-+ HelpBasePlugin.logError("Error trying to consume Lucene index from bundle "+bundle.toString()+". Please use an index built with Lucene 5 or higher.", null); //$NON-NLS-1$ //$NON-NLS-2$
- return false;
- }
- } catch (MalformedURLException mue) {
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
-deleted file mode 100644
-index 08cf58a..0000000
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
-+++ /dev/null
-@@ -1,455 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2000, 2016 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- *
-- * Contributors:
-- * IBM Corporation - initial API and implementation
-- * Chris Torrence - patch for bug Bug 107648
-- *******************************************************************************/
--package org.eclipse.help.internal.search;
--import java.io.*;
--import java.util.ArrayList;
--import java.util.Collection;
--import java.util.Iterator;
--import java.util.List;
--import java.util.Locale;
--import java.util.StringTokenizer;
--
--import org.apache.lucene.analysis.*;
--import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
--import org.apache.lucene.index.*;
--import org.apache.lucene.search.*;
--import org.eclipse.help.internal.base.*;
--/**
-- * Build query acceptable by the search engine.
-- */
--public class QueryBuilder {
-- // Maximum allowed number of terms
-- private static final int MAX_TERMS = 10;
-- // Maximum allowed number of ORs
-- private static final int MAX_UNIONS = 4;
-- // Maximum allowed number terms with wild cards
-- private static final int MAX_WILD_TERMS = 2;
-- // Query from user
-- private String searchWords;
-- // Descriptor of Analyzer to process the query words
-- private AnalyzerDescriptor analyzerDesc;
-- // Analyzer to process the query words
-- private Analyzer analyzer;
-- // List of QueryWordsToken
-- private List<QueryWordsToken> analyzedTokens;
-- // List of words to highlight
-- private List<String> highlightWords = new ArrayList<>();
-- private Locale locale;
-- /**
-- * Creates a query builder for the search word. The search word is processed
-- * by a lexical analyzer.
-- */
-- public QueryBuilder(String searchWords, AnalyzerDescriptor analyzerDesc) {
-- this.searchWords = searchWords;
-- String language = analyzerDesc.getLang();
-- if (language.length() >= 5) {
-- this.locale = new Locale(language.substring(0, 2), language
-- .substring(3, 5));
-- } else {
-- this.locale = new Locale(language.substring(0, 2), ""); //$NON-NLS-1$
-- }
-- this.analyzerDesc = analyzerDesc;
-- this.analyzer = analyzerDesc.getAnalyzer();
-- }
-- /**
-- * Splits user query into tokens and returns a list of QueryWordsToken's.
-- */
-- private List<QueryWordsToken> tokenizeUserQuery(String searchWords) {
-- List<QueryWordsToken> tokenList = new ArrayList<>();
-- //Divide along quotation marks
-- //StringTokenizer qTokenizer = new StringTokenizer(searchWords.trim(),
-- // "\"", true); //$NON-NLS-1$
-- boolean withinQuotation = false;
-- String quotedString = ""; //$NON-NLS-1$
-- int termCount = 0;// keep track of number of terms to disallow too many
--
-- int fromIndex = -1;
-- searchWords = searchWords.trim();
-- while((fromIndex = searchWords.indexOf("\"", fromIndex+1))!= -1){ //$NON-NLS-1$
-- withinQuotation = !withinQuotation;
-- }
-- if( withinQuotation ) {
-- searchWords = searchWords + "\""; //$NON-NLS-1$
-- withinQuotation = !withinQuotation;
-- }
--
-- StringTokenizer qTokenizer = new StringTokenizer(searchWords,"\"",true); //$NON-NLS-1$
-- int orCount = 0; // keep track of number of ORs to disallow too many
-- while (qTokenizer.hasMoreTokens()) {
-- String curToken = qTokenizer.nextToken();
-- if (curToken.equals("\"")) { //$NON-NLS-1$
-- if (withinQuotation) {
-- // check for too many terms
-- if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER
-- && ++termCount > MAX_TERMS) {
-- throw new QueryTooComplexException();
-- }
-- tokenList.add(QueryWordsToken.exactPhrase(quotedString));
-- } else {
-- quotedString = ""; //$NON-NLS-1$
-- }
-- withinQuotation = !withinQuotation;
-- continue;
-- } else if (withinQuotation) {
-- quotedString = curToken;
-- continue;
-- } else {
-- //divide unquoted strings along white space
-- StringTokenizer parser = new StringTokenizer(curToken.trim());
-- while (parser.hasMoreTokens()) {
-- String token = parser.nextToken();
-- if (token.equalsIgnoreCase(QueryWordsToken.AND().value)) {
-- tokenList.add(QueryWordsToken.AND());
-- } else if (token
-- .equalsIgnoreCase(QueryWordsToken.OR().value)) {
-- // Check for too many OR terms
-- if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER
-- && ++orCount > MAX_UNIONS) {
-- throw new QueryTooComplexException();
-- }
-- tokenList.add(QueryWordsToken.OR());
-- } else if (token
-- .equalsIgnoreCase(QueryWordsToken.NOT().value)) {
-- tokenList.add(QueryWordsToken.NOT());
-- } else {
-- // check for too many terms
-- if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER
-- && ++termCount > MAX_TERMS) {
-- throw new QueryTooComplexException();
-- }
-- tokenList.add(QueryWordsToken.word(token));
-- }
-- }
-- }
-- }
-- return tokenList;
-- }
-- /**
-- * Apply the Analyzer to the search tokens and return the list of processed
-- * QueryWordsToken's.
-- */
-- private List<QueryWordsToken> analyzeTokens(List<QueryWordsToken> tokens) {
-- boolean isTokenAfterNot = false;
-- List<QueryWordsToken> newTokens = new ArrayList<>();
-- int wildCardTermCount = 0;
-- for (int i = 0; i < tokens.size(); i++) {
-- QueryWordsToken token = tokens.get(i);
-- if (token.type == QueryWordsToken.WORD) {
-- int questionMIndex = token.value.indexOf('?');
-- int starIndex = token.value.indexOf('*');
-- if (starIndex >= 0 || questionMIndex >= 0) {
-- if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER
-- && ++wildCardTermCount > MAX_WILD_TERMS) {
-- throw new QueryTooComplexException();
-- }
-- newTokens.add(QueryWordsToken.word(token.value
-- .toLowerCase(locale)));
-- // add word to the list of words to highlight
-- if (!isTokenAfterNot && !highlightWords.contains(token.value)) {
-- highlightWords.add(token.value);
-- }
-- } else {
-- List<String> wordList = analyzeText(analyzer, "contents", //$NON-NLS-1$
-- token.value);
-- if (wordList.size() > 0) {
-- if (!isTokenAfterNot && !highlightWords.contains(token.value)) {
-- // add original word to the list of words to
-- // highlight
-- highlightWords.add(token.value);
-- }
-- if (wordList.size() == 1) {
-- String word = wordList.get(0);
-- newTokens.add(QueryWordsToken.word(word));
-- // add analyzed word to the list of words to
-- // highlight
-- // this is required to highlight stemmed words
-- if (!isTokenAfterNot && !highlightWords.contains(word)) {
-- highlightWords.add(word);
-- }
-- } else {
-- QueryWordsPhrase phrase = QueryWordsToken.phrase();
-- for (Iterator<String> it = wordList.iterator(); it
-- .hasNext();) {
-- String word = it.next();
-- phrase.addWord(word);
-- // add each analyzed word to the list of words
-- // to highlight
-- // this is only required to highlight stemmed
-- // words.
-- // Adding words should not be done when
-- // DefaultAnalyzer is used,
-- // because it does not perform stemming and
-- // common words removal
-- // which would result in common characters
-- // highlighted all over (bug 30263)
-- if (!analyzerDesc.getId().startsWith(
-- HelpBasePlugin.PLUGIN_ID + "#")) { //$NON-NLS-1$
-- if (!isTokenAfterNot && !highlightWords.contains(word)) {
-- highlightWords.add(word);
-- }
-- }
-- }
-- newTokens.add(phrase);
-- }
-- }
-- }
-- } else if (// forget ANDs
-- /*
-- * token.type == SearchQueryToken.AND ||
-- */
-- token.type == QueryWordsToken.OR
-- || token.type == QueryWordsToken.NOT)
-- newTokens.add(token);
-- else if (token.type == QueryWordsToken.EXACT_PHRASE) {
-- List<String> wordList = analyzeText(analyzer, "exact_contents", //$NON-NLS-1$
-- token.value);
-- if (wordList.size() > 0) {
-- if (!isTokenAfterNot && !highlightWords.contains(token.value)) {
-- // add original word to the list of words to highlight
-- highlightWords.add(token.value);
-- }
-- }
-- QueryWordsExactPhrase phrase = QueryWordsToken.exactPhrase();
-- for (Iterator<String> it = wordList.iterator(); it.hasNext();) {
-- String word = it.next();
-- phrase.addWord(word);
-- // add analyzed word to the list of words to highlight
-- // if (!highlightWords.contains(word))
-- // highlightWords.add(word);
-- }
-- // add phrase only if not empty
-- if (phrase.getWords().size() > 0) {
-- newTokens.add(phrase);
-- }
-- }
-- isTokenAfterNot = (token.type == QueryWordsToken.NOT);
-- }
-- return newTokens;
-- }
-- /**
-- * Get a list of tokens corresponding to a search word or phrase
-- *
-- * @return List of String
-- */
-- private List<String> analyzeText(Analyzer analyzer, String fieldName, String text) {
-- List<String> words = new ArrayList<>(1);
-- try (Reader reader = new StringReader(text); TokenStream tStream = analyzer.tokenStream(fieldName, reader)) {
-- CharTermAttribute termAttribute = tStream.getAttribute(CharTermAttribute.class);
-- while (tStream.incrementToken()) {
-- String term = termAttribute.toString();
-- words.add(term);
-- }
-- } catch (IOException ioe) {
-- }
--
-- return words;
-- }
-- /**
-- * Obtains Lucene Query from tokens
-- *
-- * @return Query or null if no query could be created
-- */
-- private Query createLuceneQuery(List<QueryWordsToken> searchTokens, String[] fieldNames,
-- float[] boosts) {
-- // Get queries for parts separated by OR
-- List<Query> requiredQueries = getRequiredQueries(searchTokens, fieldNames,
-- boosts);
-- if (requiredQueries.size() == 0)
-- return null;
-- else if (requiredQueries.size() <= 1)
-- return requiredQueries.get(0);
-- else
-- /* if (requiredQueries.size() > 1) */
-- // OR queries
-- return (orQueries(requiredQueries));
-- }
-- /**
-- * Obtains Lucene queries for token sequences separated at OR.
-- *
-- * @return List of Query (could be empty)
-- */
-- private List<Query> getRequiredQueries(List<QueryWordsToken> tokens, String[] fieldNames,
-- float[] boosts) {
-- List<Query> oredQueries = new ArrayList<>();
-- ArrayList<QueryWordsToken> requiredQueryTokens = new ArrayList<>();
-- for (int i = 0; i < tokens.size(); i++) {
-- QueryWordsToken token = tokens.get(i);
-- if (token.type != QueryWordsToken.OR) {
-- requiredQueryTokens.add(token);
-- } else {
-- Query reqQuery = getRequiredQuery(requiredQueryTokens,
-- fieldNames, boosts);
-- if (reqQuery != null)
-- oredQueries.add(reqQuery);
-- requiredQueryTokens = new ArrayList<>();
-- }
-- }
-- Query reqQuery = getRequiredQuery(requiredQueryTokens, fieldNames,
-- boosts);
-- if (reqQuery != null)
-- oredQueries.add(reqQuery);
-- return oredQueries;
-- }
-- private Query orQueries(Collection<Query> queries) {
-- BooleanQuery bq = new BooleanQuery();
-- for (Iterator<Query> it = queries.iterator(); it.hasNext();) {
-- Query q = it.next();
-- bq.add(q, BooleanClause.Occur.SHOULD);
-- }
-- return bq;
-- }
-- /**
-- * Obtains Lucene Query for tokens containing only AND and NOT operators.
-- *
-- * @return BooleanQuery or null if no query could be created from the tokens
-- */
-- private Query getRequiredQuery(List<QueryWordsToken> requiredTokens, String[] fieldNames,
-- float[] boosts) {
-- BooleanQuery retQuery = new BooleanQuery();
-- boolean requiredTermExist = false;
-- // Parse tokens left to right
-- QueryWordsToken operator = null;
-- for (int i = 0; i < requiredTokens.size(); i++) {
-- QueryWordsToken token = requiredTokens.get(i);
-- if (token.type == QueryWordsToken.AND
-- || token.type == QueryWordsToken.NOT) {
-- operator = token;
-- continue;
-- }
-- // Creates queries for all fields
-- Query qs[] = new Query[fieldNames.length];
-- for (int f = 0; f < fieldNames.length; f++) {
-- qs[f] = token.createLuceneQuery(fieldNames[f], boosts[f]);
-- }
-- // creates the boolean query of all fields
-- Query q = qs[0];
-- if (fieldNames.length > 1) {
-- BooleanQuery allFieldsQuery = new BooleanQuery();
-- for (int f = 0; f < fieldNames.length; f++)
-- allFieldsQuery.add(qs[f], BooleanClause.Occur.SHOULD);
-- q = allFieldsQuery;
-- }
-- if (operator != null && operator.type == QueryWordsToken.NOT) {
-- retQuery.add(q, BooleanClause.Occur.MUST_NOT); // add as prohibited
-- } else {
-- retQuery.add(q, BooleanClause.Occur.MUST); // add as required
-- requiredTermExist = true;
-- }
-- }
-- if (!requiredTermExist) {
-- return null; // cannot search for prohibited only
-- }
-- return retQuery;
-- }
-- private Query getLuceneQuery(String[] fieldNames, float[] boosts) {
-- Query luceneQuery = createLuceneQuery(analyzedTokens, fieldNames,
-- boosts);
-- return luceneQuery;
-- }
-- /**
-- * @param fieldNames -
-- * Collection of field names of type String (e.g. "h1"); the
-- * search will be performed on the given fields
-- * @param fieldSearchOnly -
-- * boolean indicating if field only search should be performed;
-- * if set to false, default field "contents" and all other fields
-- * will be searched
-- */
-- public Query getLuceneQuery(Collection<String> fieldNames, boolean fieldSearchOnly)
-- throws QueryTooComplexException {
-- // split search query into tokens
-- List<QueryWordsToken> userTokens = tokenizeUserQuery(searchWords);
-- analyzedTokens = analyzeTokens(userTokens);
-- return buildLuceneQuery(fieldNames, fieldSearchOnly);
-- }
-- /**
-- * @param fieldNames -
-- * Collection of field names of type String (e.g. "h1"); the
-- * search will be performed on the given fields
-- * @param fieldSearchOnly -
-- * boolean indicating if field only search should be performed;
-- * if set to false, default field "contents" and all other fields
-- * will be searched
-- */
-- private Query buildLuceneQuery(Collection<String> fieldNames,
-- boolean fieldSearchOnly) {
-- String[] fields;
-- float[] boosts;
-- if (fieldSearchOnly) {
-- fields = new String[fieldNames.size()];
-- boosts = new float[fieldNames.size()];
-- Iterator<String> fieldNamesIt = fieldNames.iterator();
-- for (int i = 0; i < fieldNames.size(); i++) {
-- fields[i] = fieldNamesIt.next();
-- boosts[i] = 5.0f;
-- }
-- } else {
-- fields = new String[fieldNames.size() + 2];
-- boosts = new float[fieldNames.size() + 2];
-- Iterator<String> fieldNamesIt = fieldNames.iterator();
-- for (int i = 0; i < fieldNames.size(); i++) {
-- fields[i] = fieldNamesIt.next();
-- boosts[i] = 5.0f;
-- }
-- fields[fieldNames.size()] = "contents"; //$NON-NLS-1$
-- boosts[fieldNames.size()] = 1.0f;
-- fields[fieldNames.size()+1] = "title"; //$NON-NLS-1$
-- boosts[fieldNames.size()+1] = 1.0f;
-- }
-- Query query = getLuceneQuery(fields, boosts);
-- query = improveRankingForUnqotedPhrase(query, fields, boosts);
-- return query;
-- }
-- /**
-- * If user query contained only words (no quotaions nor operators) extends
-- * query with term phrase representing entire user query i.e for user string
-- * a b, the query a AND b will be extended to "a b" OR a AND b
-- */
-- private Query improveRankingForUnqotedPhrase(Query query, String[] fields,
-- float[] boosts) {
-- if (query == null)
-- return query;
-- // check if all tokens are words
-- for (int i = 0; i < analyzedTokens.size(); i++)
-- if (analyzedTokens.get(i).type != QueryWordsToken.WORD)
-- return query;
-- // Create phrase query for all tokens and OR with original query
-- BooleanQuery booleanQuery = new BooleanQuery();
-- booleanQuery.add(query, BooleanClause.Occur.SHOULD);
-- PhraseQuery[] phraseQueries = new PhraseQuery[fields.length];
-- for (int f = 0; f < fields.length; f++) {
-- phraseQueries[f] = new PhraseQuery();
-- for (int i = 0; i < analyzedTokens.size(); i++) {
-- Term t = new Term(fields[f], analyzedTokens
-- .get(i).value);
-- phraseQueries[f].add(t);
-- }
-- phraseQueries[f].setBoost(10 * boosts[f]);
-- booleanQuery.add(phraseQueries[f], BooleanClause.Occur.SHOULD);
-- }
-- return booleanQuery;
-- }
-- /**
-- * Obtains analyzed terms from query as one string. Words are double quoted,
-- * and separated by space. The analyzed words are needed for highlighting
-- * word roots.
-- */
-- public String gethighlightTerms() {
-- StringBuffer buf = new StringBuffer();
-- for (Iterator<String> it = highlightWords.iterator(); it.hasNext();) {
-- buf.append('"');
-- buf.append(it.next());
-- buf.append("\" "); //$NON-NLS-1$
-- }
-- return buf.toString();
-- }
--}
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java
-deleted file mode 100644
-index 324b8e1..0000000
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java
-+++ /dev/null
-@@ -1,51 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2000, 2015 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- *
-- * Contributors:
-- * IBM Corporation - initial API and implementation
-- *******************************************************************************/
--package org.eclipse.help.internal.search;
--import java.util.ArrayList;
--import java.util.Iterator;
--import java.util.List;
--
--import org.apache.lucene.index.*;
--import org.apache.lucene.search.*;
--/**
-- * Represents a quoted token in user search query words
-- */
--public class QueryWordsExactPhrase extends QueryWordsToken {
-- private List<String> words;
-- public QueryWordsExactPhrase() {
-- super(QueryWordsToken.EXACT_PHRASE, ""); //$NON-NLS-1$
-- words = new ArrayList<>();
-- }
-- public void addWord(String word) {
-- words.add(word);
-- if (words.size() <= 1)
-- value = word;
-- else
-- value += " " + word; //$NON-NLS-1$
-- }
-- public List<String> getWords() {
-- return words;
-- }
-- /**
-- * Creates a lucene query for a field
-- */
-- @Override
-- public Query createLuceneQuery(String field, float boost) {
-- PhraseQuery q = new PhraseQuery();
-- for (Iterator<String> it = getWords().iterator(); it.hasNext();) {
-- String word = it.next();
-- Term t = new Term("exact_" + field, word); //$NON-NLS-1$
-- q.add(t);
-- q.setBoost(boost);
-- }
-- return q;
-- }
--}
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java
-deleted file mode 100644
-index 8a94e89..0000000
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java
-+++ /dev/null
-@@ -1,52 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2000, 2015 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- *
-- * Contributors:
-- * IBM Corporation - initial API and implementation
-- *******************************************************************************/
--package org.eclipse.help.internal.search;
--import java.util.ArrayList;
--import java.util.Iterator;
--import java.util.List;
--
--import org.apache.lucene.index.*;
--import org.apache.lucene.search.*;
--/**
-- * Represents a phrase (not quoted) token in user search query words It consists
-- * of several words created by an analyzer
-- */
--public class QueryWordsPhrase extends QueryWordsToken {
-- private List<String> words;
-- public QueryWordsPhrase() {
-- super(QueryWordsToken.PHRASE, ""); //$NON-NLS-1$
-- words = new ArrayList<>();
-- }
-- public void addWord(String word) {
-- words.add(word);
-- if (words.size() <= 1)
-- value = word;
-- else
-- value += " " + word; //$NON-NLS-1$
-- }
-- public List<String> getWords() {
-- return words;
-- }
-- /**
-- * Creates a lucene query for a field
-- */
-- @Override
-- public Query createLuceneQuery(String field, float boost) {
-- PhraseQuery q = new PhraseQuery();
-- for (Iterator<String> it = getWords().iterator(); it.hasNext();) {
-- String word = it.next();
-- Term t = new Term(field, word);
-- q.add(t);
-- q.setBoost(boost);
-- }
-- return q;
-- }
--}
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsToken.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsToken.java
-deleted file mode 100644
-index 6ba76f2..0000000
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsToken.java
-+++ /dev/null
-@@ -1,81 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- *
-- * Contributors:
-- * IBM Corporation - initial API and implementation
-- *******************************************************************************/
--package org.eclipse.help.internal.search;
--import org.apache.lucene.index.*;
--import org.apache.lucene.search.*;
--/**
-- * Represents a token in user search query words
-- */
--public class QueryWordsToken {
-- public static final int AND = 0;
-- public static final int OR = 1;
-- public static final int NOT = 2;
-- public static final int EXACT_PHRASE = 3;
-- public static final int PHRASE = 4;
-- public static final int WORD = 5;
-- private static final QueryWordsToken fAND = new QueryWordsToken(AND, "AND"); //$NON-NLS-1$
-- private static final QueryWordsToken fOR = new QueryWordsToken(OR, "OR"); //$NON-NLS-1$
-- private static final QueryWordsToken fNOT = new QueryWordsToken(NOT, "NOT"); //$NON-NLS-1$
-- public int type;
-- public String value;
-- protected QueryWordsToken(int type, String value) {
-- this.type = type;
-- this.value = value;
-- }
-- /**
-- * Creates a lucene query for a field
-- */
-- public Query createLuceneQuery(String field, float boost) {
-- Query q;
-- int questionPos = value.indexOf('?');
-- int starPos = value.indexOf('*');
-- if (questionPos >= 0 || starPos >= 0) {
-- if (questionPos == -1 && starPos == value.length() - 1) {
-- Term t = new Term("exact_" + field, value.substring(0, starPos)); //$NON-NLS-1$
-- q = new PrefixQuery(t);
-- ((PrefixQuery) q).setBoost(boost);
-- } else {
-- Term t = new Term("exact_" + field, value); //$NON-NLS-1$
-- q = new WildcardQuery(t);
-- ((WildcardQuery) q).setBoost(boost);
-- }
-- } else {
-- Term t = new Term(field, value);
-- q = new TermQuery(t);
-- ((TermQuery) q).setBoost(boost);
-- }
-- // after updating Lucene, set boost on a Query class
-- return q;
-- }
-- public static QueryWordsToken AND() {
-- return fAND;
-- }
-- public static QueryWordsToken OR() {
-- return fOR;
-- }
-- public static QueryWordsToken NOT() {
-- return fNOT;
-- }
-- public static QueryWordsToken word(String word) {
-- return new QueryWordsToken(QueryWordsToken.WORD, word);
-- }
-- public static QueryWordsPhrase phrase() {
-- return new QueryWordsPhrase();
-- }
-- public static QueryWordsExactPhrase exactPhrase() {
-- return new QueryWordsExactPhrase();
-- }
-- public static QueryWordsExactPhrase exactPhrase(String word) {
-- QueryWordsExactPhrase token = new QueryWordsExactPhrase();
-- token.addWord(word);
-- return token;
-- }
--}
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
-index 67963a5..131ac65 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
-@@ -17,6 +16,7 @@
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.RandomAccessFile;
-+import java.io.StringReader;
- import java.net.MalformedURLException;
- import java.net.URL;
- import java.nio.channels.FileLock;
-@@ -33,19 +33,30 @@
- import java.util.zip.ZipEntry;
- import java.util.zip.ZipInputStream;
-
--import org.apache.lucene.analysis.LimitTokenCountAnalyzer;
-+import org.apache.lucene.analysis.miscellaneous.LimitTokenCountAnalyzer;
- import org.apache.lucene.document.Document;
- import org.apache.lucene.document.Field;
-+import org.apache.lucene.document.StoredField;
-+import org.apache.lucene.document.StringField;
-+import org.apache.lucene.index.DirectoryReader;
- import org.apache.lucene.index.IndexReader;
- import org.apache.lucene.index.IndexWriter;
--import org.apache.lucene.index.Term;
--import org.apache.lucene.index.TermDocs;
--import org.apache.lucene.index.IndexWriterConfig.OpenMode;
- import org.apache.lucene.index.IndexWriterConfig;
-+import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-+import org.apache.lucene.index.LeafReader;
- import org.apache.lucene.index.LogByteSizeMergePolicy;
- import org.apache.lucene.index.LogMergePolicy;
-+import org.apache.lucene.index.PostingsEnum;
-+import org.apache.lucene.index.SlowCompositeReaderWrapper;
-+import org.apache.lucene.index.Term;
-+import org.apache.lucene.queryparser.classic.FastCharStream;
-+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
-+import org.apache.lucene.queryparser.classic.QueryParserTokenManager;
-+import org.apache.lucene.queryparser.classic.Token;
-+import org.apache.lucene.search.BooleanClause.Occur;
- import org.apache.lucene.search.BooleanQuery;
- import org.apache.lucene.search.IndexSearcher;
-+import org.apache.lucene.search.MultiTermQuery;
- import org.apache.lucene.search.Query;
- import org.apache.lucene.search.TopDocs;
- import org.apache.lucene.store.Directory;
-@@ -59,7 +70,6 @@
- import org.eclipse.core.runtime.OperationCanceledException;
- import org.eclipse.core.runtime.Platform;
- import org.eclipse.core.runtime.Status;
--import org.eclipse.help.internal.HelpPlugin;
- import org.eclipse.help.internal.base.BaseHelpSystem;
- import org.eclipse.help.internal.base.HelpBasePlugin;
- import org.eclipse.help.internal.base.util.HelpProperties;
-@@ -86,7 +96,7 @@
-
- private File indexDir;
-
-- private Directory luceneDirectory;
-+ public Directory luceneDirectory;
-
- private String locale;
-
-@@ -170,7 +180,7 @@
- inconsistencyFile = new File(indexDir.getParentFile(), locale + ".inconsistent"); //$NON-NLS-1$
- htmlSearchParticipant = new HTMLSearchParticipant(indexDir.getAbsolutePath());
- try {
-- luceneDirectory = new NIOFSDirectory(indexDir);
-+ luceneDirectory = new NIOFSDirectory(indexDir.toPath());
- } catch (IOException e) {
- }
- if (!exists()) {
-@@ -203,11 +213,11 @@
- public IStatus addDocument(String name, URL url) {
- try {
- Document doc = new Document();
-- doc.add(new Field(FIELD_NAME, name, Field.Store.YES, Field.Index.NOT_ANALYZED));
-+ doc.add(new StringField(FIELD_NAME, name, Field.Store.YES));
- addExtraFields(doc);
- String pluginId = LocalSearchManager.getPluginId(name);
- if (relativePath != null) {
-- doc.add(new Field(FIELD_INDEX_ID, relativePath, Field.Store.YES, Field.Index.NOT_ANALYZED));
-+ doc.add(new StringField(FIELD_INDEX_ID, relativePath, Field.Store.YES));
- }
- // check for the explicit search participant.
- SearchParticipant participant = null;
-@@ -220,20 +230,22 @@
- if (participant == null)
- participant = BaseHelpSystem.getLocalSearchManager().getParticipant(pluginId, name);
- if (participant != null) {
-- IStatus status = participant.addDocument(this, pluginId, name, url, id, new LuceneSearchDocument(doc));
-+ IStatus status = participant.addDocument(this, pluginId, name, url, id,
-+ new LuceneSearchDocument(doc));
- if (status.getSeverity() == IStatus.OK) {
- String filters = doc.get("filters"); //$NON-NLS-1$
- indexedDocs.put(name, filters != null ? filters : "0"); //$NON-NLS-1$
- if (id != null)
-- doc.add(new Field("id", id, Field.Store.YES, Field.Index.NO)); //$NON-NLS-1$
-+ doc.add(new StoredField("id", id)); //$NON-NLS-1$
- if (pid != null)
-- doc.add(new Field("participantId", pid, Field.Store.YES, Field.Index.NO)); //$NON-NLS-1$
-+ doc.add(new StoredField("participantId", pid)); //$NON-NLS-1$
- iw.addDocument(doc);
- }
- return status;
- }
- // default to html
-- IStatus status = htmlSearchParticipant.addDocument(this, pluginId, name, url, id, new LuceneSearchDocument(doc));
-+ IStatus status = htmlSearchParticipant.addDocument(this, pluginId, name, url, id,
-+ new LuceneSearchDocument(doc));
- if (status.getSeverity() == IStatus.OK) {
- String filters = doc.get("filters"); //$NON-NLS-1$
- indexedDocs.put(name, filters != null ? filters : "0"); //$NON-NLS-1$
-@@ -245,20 +257,21 @@
- "IO exception occurred while adding document " + name //$NON-NLS-1$
- + " to index " + indexDir.getAbsolutePath() + ".", //$NON-NLS-1$ //$NON-NLS-2$
- e);
-- }
-- catch (Exception e) {
-+ } catch (Exception e) {
- return new Status(IStatus.ERROR, HelpBasePlugin.PLUGIN_ID, IStatus.ERROR,
- "An unexpected internal error occurred while adding document " //$NON-NLS-1$
- + name + " to index " + indexDir.getAbsolutePath() //$NON-NLS-1$
-- + ".", e); //$NON-NLS-1$
-+ + ".", //$NON-NLS-1$
-+ e);
- }
- }
-
- /**
-- * Add any extra fields that need to be added to this document. Subclasses
-- * should override to add more fields.
-+ * Add any extra fields that need to be added to this document. Subclasses should override to
-+ * add more fields.
- *
-- * @param doc the document to add fields to
-+ * @param doc
-+ * the document to add fields to
- */
- protected void addExtraFields(Document doc) {
- }
-@@ -282,8 +295,9 @@
- indexedDocs = new HelpProperties(INDEXED_DOCS_FILE, indexDir);
- indexedDocs.restore();
- setInconsistent(true);
-- LimitTokenCountAnalyzer analyzer = new LimitTokenCountAnalyzer(analyzerDescriptor.getAnalyzer(), 1000000);
-- IndexWriterConfig writerConfig = new IndexWriterConfig(org.apache.lucene.util.Version.LUCENE_31, analyzer);
-+ LimitTokenCountAnalyzer analyzer = new LimitTokenCountAnalyzer(analyzerDescriptor.getAnalyzer(),
-+ 1000000);
-+ IndexWriterConfig writerConfig = new IndexWriterConfig(analyzer);
- writerConfig.setOpenMode(create ? OpenMode.CREATE : OpenMode.APPEND);
- LogMergePolicy mergePolicy = new LogByteSizeMergePolicy();
- mergePolicy.setMergeFactor(20);
-@@ -307,7 +321,7 @@
- indexedDocs = new HelpProperties(INDEXED_DOCS_FILE, indexDir);
- indexedDocs.restore();
- setInconsistent(true);
-- ir = IndexReader.open(luceneDirectory, false);
-+ ir = DirectoryReader.open(luceneDirectory);
- return true;
- } catch (IOException e) {
- HelpBasePlugin.logError("Exception occurred in search indexing at beginDeleteBatch.", e); //$NON-NLS-1$
-@@ -323,7 +337,7 @@
- if (ir != null) {
- ir.close();
- }
-- ir = IndexReader.open(luceneDirectory, false);
-+ ir = DirectoryReader.open(luceneDirectory);
- return true;
- } catch (IOException e) {
- HelpBasePlugin.logError("Exception occurred in search indexing at beginDeleteBatch.", e); //$NON-NLS-1$
-@@ -334,14 +348,14 @@
- /**
- * Deletes a single document from the index.
- *
-- * @param name -
-- * document name
-+ * @param name
-+ * - document name
- * @return IStatus
- */
- public IStatus removeDocument(String name) {
- Term term = new Term(FIELD_NAME, name);
- try {
-- ir.deleteDocuments(term);
-+ iw.deleteDocuments(term);
- indexedDocs.remove(name);
- } catch (IOException e) {
- return new Status(IStatus.ERROR, HelpBasePlugin.PLUGIN_ID, IStatus.ERROR,
-@@ -375,11 +389,11 @@
- }
-
- /*
-- * The searcher's index reader has it's stuff in memory so it won't
-- * know about this change. Close it so that it gets reloaded next search.
-+ * The searcher's index reader has it's stuff in memory so it won't know about this
-+ * change. Close it so that it gets reloaded next search.
- */
- if (searcher != null) {
-- searcher.close();
-+ searcher.getIndexReader().close();
- searcher = null;
- }
- return true;
-@@ -407,11 +421,11 @@
- saveDependencies();
-
- /*
-- * The searcher's index reader has it's stuff in memory so it won't
-- * know about this change. Close it so that it gets reloaded next search.
-+ * The searcher's index reader has it's stuff in memory so it won't know about this
-+ * change. Close it so that it gets reloaded next search.
- */
- if (searcher != null) {
-- searcher.close();
-+ searcher.getIndexReader().close();
- searcher = null;
- }
- return true;
-@@ -469,11 +483,11 @@
- String indexId = indexIds.get(i);
- String indexPath = indexPaths.get(i);
- try {
-- dirList.add(new NIOFSDirectory(new File(indexPath)));
-+ dirList.add(new NIOFSDirectory(new File(indexPath).toPath()));
- } catch (IOException ioe) {
-- HelpBasePlugin
-- .logError(
-- "Help search indexing directory could not be created for directory " + indexPath, ioe); //$NON-NLS-1$
-+ HelpBasePlugin.logError(
-+ "Help search indexing directory could not be created for directory " + indexPath, //$NON-NLS-1$
-+ ioe);
- continue;
- }
-
-@@ -525,18 +539,19 @@
- }
-
- public IStatus removeDuplicates(String name, String[] index_paths) {
-- TermDocs hrefDocs = null;
-- TermDocs indexDocs = null;
-- Term hrefTerm = new Term(FIELD_NAME, name);
- try {
-+ LeafReader ar = SlowCompositeReaderWrapper.wrap(ir);
-+ PostingsEnum hrefDocs = null;
-+ PostingsEnum indexDocs = null;
-+ Term hrefTerm = new Term(FIELD_NAME, name);
- for (int i = 0; i < index_paths.length; i++) {
- Term indexTerm = new Term(FIELD_INDEX_ID, index_paths[i]);
- if (i == 0) {
-- hrefDocs = ir.termDocs(hrefTerm);
-- indexDocs = ir.termDocs(indexTerm);
-+ hrefDocs = ar.postings(hrefTerm);
-+ indexDocs = ar.postings(indexTerm);
- } else {
-- hrefDocs.seek(hrefTerm);
-- indexDocs.seek(indexTerm);
-+ hrefDocs = ar.postings(hrefTerm);
-+ indexDocs = ar.postings(indexTerm);
- }
- removeDocuments(hrefDocs, indexDocs);
- }
-@@ -545,19 +560,6 @@
- "IO exception occurred while removing duplicates of document " + name //$NON-NLS-1$
- + " from index " + indexDir.getAbsolutePath() + ".", //$NON-NLS-1$ //$NON-NLS-2$
- ioe);
-- } finally {
-- if (hrefDocs != null) {
-- try {
-- hrefDocs.close();
-- } catch (IOException e) {
-- }
-- }
-- if (indexDocs != null) {
-- try {
-- indexDocs.close();
-- } catch (IOException e) {
-- }
-- }
- }
- return Status.OK_STATUS;
- }
-@@ -569,33 +571,33 @@
- * @param docs2
- * @throws IOException
- */
-- private void removeDocuments(TermDocs doc1, TermDocs docs2) throws IOException {
-- if (!doc1.next()) {
-+ private void removeDocuments(PostingsEnum doc1, PostingsEnum docs2) throws IOException {
-+ if (doc1.nextDoc() == PostingsEnum.NO_MORE_DOCS) {
- return;
- }
-- if (!docs2.next()) {
-+ if (docs2.nextDoc() == PostingsEnum.NO_MORE_DOCS) {
- return;
- }
- while (true) {
-- if (doc1.doc() < docs2.doc()) {
-- if (!doc1.skipTo(docs2.doc())) {
-- if (!doc1.next()) {
-+ if (doc1.docID() < docs2.docID()) {
-+ if (doc1.advance(docs2.docID()) == PostingsEnum.NO_MORE_DOCS) {
-+ if (doc1.nextDoc() == PostingsEnum.NO_MORE_DOCS) {
- return;
- }
- }
-- } else if (doc1.doc() > docs2.doc()) {
-- if (!docs2.skipTo(doc1.doc())) {
-- if (!doc1.next()) {
-+ } else if (doc1.docID() > docs2.docID()) {
-+ if (docs2.advance(doc1.docID()) == PostingsEnum.NO_MORE_DOCS) {
-+ if (doc1.nextDoc() == PostingsEnum.NO_MORE_DOCS) {
- return;
- }
- }
- }
-- if (doc1.doc() == docs2.doc()) {
-- ir.deleteDocument(doc1.doc());
-- if (!doc1.next()) {
-+ if (doc1.docID() == docs2.docID()) {
-+ iw.tryDeleteDocument(ir, doc1.docID());
-+ if (doc1.nextDoc() == PostingsEnum.NO_MORE_DOCS) {
- return;
- }
-- if (!docs2.next()) {
-+ if (docs2.nextDoc() == PostingsEnum.NO_MORE_DOCS) {
- return;
- }
- }
-@@ -623,20 +625,72 @@
- registerSearch(Thread.currentThread());
- if (closed)
- return;
-- QueryBuilder queryBuilder = new QueryBuilder(searchQuery.getSearchWord(), analyzerDescriptor);
-- Query luceneQuery = queryBuilder.getLuceneQuery(searchQuery.getFieldNames(), searchQuery
-- .isFieldSearch());
-- if (HelpPlugin.DEBUG_SEARCH) {
-- System.out.println("Search Query: " + luceneQuery.toString()); //$NON-NLS-1$
-+
-+ String[] fields;
-+ if (searchQuery.isFieldSearch()){
-+ //sometimes you might want to search other than the default fields
-+ fields = (String[]) searchQuery.getFieldNames().toArray();
-+ }else {
-+ fields = new String[]{"contents","title"}; //$NON-NLS-1$ //$NON-NLS-2$
- }
-- String highlightTerms = queryBuilder.gethighlightTerms();
-- if (luceneQuery != null) {
-+
-+ //prepare the parser
-+
-+ MultiFieldQueryParser qb = new MultiFieldQueryParser(fields,analyzerDescriptor.getAnalyzer());
-+ qb.setAllowLeadingWildcard(true);
-+ qb.setAnalyzeRangeTerms(true);
-+ qb.setAutoGeneratePhraseQueries(true);
-+ qb.setMultiTermRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_REWRITE);
-+ qb.setLowercaseExpandedTerms(true);
-+ qb.setLocale(new Locale(analyzerDescriptor.getLang()));
-+
-+ //parse the "pure" query (no boosting)
-+ Query luceneQuery = qb.parse(searchQuery.getSearchWord());
-+
-+ //we'll merge the pure query with a some boosted queries
-+ Query mergedQuery;
-+
-+ if (!isWildcardQuery(searchQuery.getSearchWord())){
-+ mergedQuery = new BooleanQuery(); //merge for all fields before merging with luceneQuery
-+ for (int i=0;i<fields.length;i++){
-+ Query exactBoostQuery= qb.createPhraseQuery(fields[i], searchQuery.getSearchWord());
-+ exactBoostQuery.setBoost(10.0f);
-+ ((BooleanQuery) mergedQuery).add(exactBoostQuery,Occur.SHOULD);
-+ }
-+ ((BooleanQuery) mergedQuery).add(luceneQuery,Occur.SHOULD);
-+
-+ }else {
-+ mergedQuery = luceneQuery;
-+ }
-+
-+ Set<String> set = new HashSet<String>();
-+
-+ if (mergedQuery != null) {
- if (searcher == null) {
- openSearcher();
- }
-- TopDocs topDocs = searcher.search(luceneQuery, null, 1000);
-- collector.addHits(LocalSearchManager.asList(topDocs, searcher), highlightTerms);
-+ TopDocs topDocs = searcher.search(mergedQuery, 1000);
-+
-+ String highlight=null;
-+ QueryParserTokenManager manager = new QueryParserTokenManager(new FastCharStream(new StringReader(searchQuery.getSearchWord())));
-+ while (true){
-+ Token nextToken = manager.getNextToken();
-+ String toHighlight = null;
-+ if (nextToken.kind==0) break;
-+ String image = nextToken.image;
-+ toHighlight=image;
-+ if ((image.startsWith("\""))&&( image.endsWith("\""))){ //$NON-NLS-1$//$NON-NLS-2$
-+ toHighlight = image.substring(1,image.length()-1);
-+ }
-+ if (image.equals("AND") || image.equals("OR")) //$NON-NLS-1$ //$NON-NLS-2$
-+ continue;
-+ set .add(toHighlight);
-+
-+ }
-+ highlight = buildHighlight(set);
-+ collector.addHits(LocalSearchManager.asList(topDocs, searcher), highlight==null?"":highlight); //$NON-NLS-1$
- }
-+
- } catch (BooleanQuery.TooManyClauses tmc) {
- collector.addQTCException(new QueryTooComplexException());
- } catch (QueryTooComplexException qe) {
-@@ -647,6 +701,18 @@
- } finally {
- unregisterSearch(Thread.currentThread());
- }
-+ }
-+
-+ private boolean isWildcardQuery(String searchWord) {
-+ return searchWord.contains("?")|| searchWord.contains("*"); //$NON-NLS-1$//$NON-NLS-2$
-+ }
-+
-+ private String buildHighlight(Set<String> set) {
-+ StringBuilder sb = new StringBuilder();
-+ for (String string : set) {
-+ sb.append("\""+string+"\""); //$NON-NLS-1$//$NON-NLS-2$
-+ }
-+ return sb.toString();
- }
-
- @Override
-@@ -718,25 +785,27 @@
-
- /**
- * Determines whether an index can be read by the Lucene bundle
-- * @param indexVersionString The version of an Index directory
-+ *
-+ * @param indexVersionString
-+ * The version of an Index directory
- * @return
- */
- public boolean isLuceneCompatible(String indexVersionString) {
-- if (indexVersionString==null) return false;
-+ if (indexVersionString == null)
-+ return false;
- String luceneVersionString = ""; //$NON-NLS-1$
- Bundle luceneBundle = Platform.getBundle(LUCENE_BUNDLE_ID);
- if (luceneBundle != null) {
-- luceneVersionString += luceneBundle.getHeaders()
-- .get(Constants.BUNDLE_VERSION);
-+ luceneVersionString += luceneBundle.getHeaders().get(Constants.BUNDLE_VERSION);
- }
- Version luceneVersion = new Version(luceneVersionString);
- Version indexVersion = new Version(indexVersionString);
-- Version v191 = new Version(1, 9, 1);
-- if (indexVersion.compareTo(v191) < 0) {
-- // index is older than Lucene 1.9.1
-+ Version v500 = new Version(5, 0, 0);
-+ if (indexVersion.compareTo(v500) < 0) {
-+ // index is older than Lucene 5.0.0
- return false;
- }
-- if ( luceneVersion.compareTo(indexVersion) >= 0 ) {
-+ if (luceneVersion.compareTo(indexVersion) >= 0) {
- // Lucene bundle is newer than the index
- return true;
- }
-@@ -801,7 +870,7 @@
- public void openSearcher() throws IOException {
- synchronized (searcherCreateLock) {
- if (searcher == null) {
-- searcher = new IndexSearcher(IndexReader.open(luceneDirectory, false));
-+ searcher = new IndexSearcher(DirectoryReader.open(luceneDirectory));
- }
- }
- }
-@@ -819,7 +888,7 @@
- if (searches.isEmpty()) {
- if (searcher != null) {
- try {
-- searcher.close();
-+ searcher.getIndexReader().close();
- } catch (IOException ioe) {
- }
- }
-@@ -837,7 +906,8 @@
- * Finds and unzips prebuild index specified in preferences
- */
- private void unzipProductIndex() {
-- String indexPluginId = Platform.getPreferencesService().getString(HelpBasePlugin.PLUGIN_ID, "productIndex", null, null); //$NON-NLS-1$
-+ String indexPluginId = Platform.getPreferencesService().getString(HelpBasePlugin.PLUGIN_ID,
-+ "productIndex", null, null); //$NON-NLS-1$
- if (indexPluginId == null || indexPluginId.length() <= 0) {
- return;
- }
-@@ -899,7 +969,7 @@
- private void cleanOldIndex() {
- try (LimitTokenCountAnalyzer analyzer = new LimitTokenCountAnalyzer(analyzerDescriptor.getAnalyzer(), 10000);
- IndexWriter cleaner = new IndexWriter(luceneDirectory,
-- new IndexWriterConfig(org.apache.lucene.util.Version.LUCENE_31, analyzer)
-+ new IndexWriterConfig(analyzer)
- .setOpenMode(OpenMode.CREATE))) {
-
- } catch (IOException ioe) {
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
-index d0a7bb7..444b66c 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
-@@ -7,10 +7,9 @@
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.help.internal.search;
--
--import java.io.*;
-
- import org.apache.lucene.analysis.*;
-
-@@ -18,7 +17,7 @@
- * Smart Analyzer. Chooses underlying implementation based on the field which
- * text is analyzed.
- */
--public final class SmartAnalyzer extends Analyzer {
-+public final class SmartAnalyzer extends AnalyzerWrapper {
- Analyzer pluggedInAnalyzer;
- Analyzer exactAnalyzer;
-
-@@ -26,20 +25,19 @@
- * Constructor for SmartAnalyzer.
- */
- public SmartAnalyzer(String locale, Analyzer pluggedInAnalyzer) {
-- super();
-+ super(pluggedInAnalyzer.getReuseStrategy());
- this.pluggedInAnalyzer = pluggedInAnalyzer;
- this.exactAnalyzer = new DefaultAnalyzer(locale);
- }
- /**
-- * Creates a TokenStream which tokenizes all the text in the provided
-- * Reader. Delegates to DefaultAnalyzer when field used to search for exact
-+ * Delegates to DefaultAnalyzer when field used to search for exact
- * match, and to plugged-in analyzer for other fields.
- */
- @Override
-- public final TokenStream tokenStream(String fieldName, Reader reader) {
-+ public final Analyzer getWrappedAnalyzer(String fieldName) {
- if (fieldName != null && fieldName.startsWith("exact_")) { //$NON-NLS-1$
-- return exactAnalyzer.tokenStream(fieldName, reader);
-+ return exactAnalyzer;
- }
-- return pluggedInAnalyzer.tokenStream(fieldName, reader);
-+ return pluggedInAnalyzer;
- }
- }
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
-index 0b70cf7..79d5592 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
-@@ -7,16 +7,18 @@
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.help.internal.search;
-
--import com.ibm.icu.text.BreakIterator;
- import java.io.IOException;
--import java.io.Reader;
- import java.util.Locale;
-+
- import org.apache.lucene.analysis.TokenStream;
- import org.apache.lucene.analysis.Tokenizer;
- import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-+
-+import com.ibm.icu.text.BreakIterator;
-
- /**
- * WordTokenStream obtains tokens containing words appropriate for use with
-@@ -24,7 +26,6 @@
- */
- public final class WordTokenStream extends Tokenizer {
- private static final int BUF_LEN = 4096;
-- private final Reader reader;
- private final BreakIterator boundary;
- private StringBuffer strbuf;
-
-@@ -34,8 +35,8 @@
- /**
- * Constructor
- */
-- public WordTokenStream(String fieldName, Reader reader, Locale locale) {
-- this.reader = reader;
-+ public WordTokenStream(Locale locale) {
-+ super();
- boundary = BreakIterator.getWordInstance(locale);
-
- }
-@@ -52,9 +53,9 @@
- if(strbuf == null) {
- int available;
- char[] cbuf = new char[BUF_LEN];
-- while ((available = reader.read(cbuf)) <= 0) {
-+ while ((available = input.read(cbuf)) <= 0) {
- if (available < 0) {
-- reader.close();
-+ input.close();
- return false;
- }
- }
-@@ -62,7 +63,7 @@
- strbuf.append(cbuf, 0, available);
- // read more until white space (or EOF)
- int c;
-- while (0 <= (c = reader.read())) {
-+ while (0 <= (c = input.read())) {
- strbuf.append((char) c);
- if (c == ' ' || c == '\r' || c == '\n' || c == '\t') {
- break;
-@@ -70,7 +71,7 @@
- }
-
- if (c < 0) {
-- reader.close();
-+ input.close();
- }
-
- boundary.setText(strbuf.toString());
-@@ -107,9 +108,10 @@
-
- @Override
- public void close() throws IOException {
-+ super.close();
- /// Unlikely to be called as this is a reused
-- if (this.reader != null) {
-- this.reader.close();
-+ if (this.input != null) {
-+ this.input.close();
- }
- }
- }
-diff --git a/eclipse.platform.ua/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/feature.xml b/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/feature.xml
-index 8438100..174e92a 100644
---- a/eclipse.platform.ua/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/feature.xml
-+++ b/eclipse.platform.ua/org.eclipse.help.webapp/web-archive/org.eclipse.help.infocenter-feature/feature.xml
-@@ -74,20 +74,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.lucene.analysis"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.apache.lucene.core"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.core.contenttype"
- download-size="0"
- install-size="0"
-@@ -227,4 +213,32 @@
- version="0.0.0"
- unpack="false"/>
-
-+ <plugin
-+ id="org.apache.lucene.analyzers-common"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.apache.lucene.analyzers-smartcn"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.apache.lucene.core"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.apache.lucene.queryparser"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
- </feature>
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
-index 6bcf9bc..23f8910 100644
---- a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
-@@ -19,14 +19,13 @@
- org.eclipse.ui.forms,
- org.eclipse.ui.browser;bundle-version="3.2.300",
- org.eclipse.equinox.jsp.jasper;bundle-version="1.0.200",
-- org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100"
-+ org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100",
-+ org.apache.lucene.analyzers-common;bundle-version="5.1.0",
-+ org.apache.lucene.core;bundle-version="5.1.0"
- Bundle-ActivationPolicy: lazy
- Bundle-Vendor: Eclipse.org
- Import-Package: javax.servlet;version="3.1.0",
-- javax.servlet.http;version="3.1.0",
-- org.apache.lucene.index;core=split;version="[3.5.0,4.0.0)",
-- org.apache.lucene.search;core=split;version="[3.5.0,4.0.0)",
-- org.apache.lucene.store;core=split;version="[3.5.0,4.0.0)"
-+ javax.servlet.http;version="3.1.0"
- Bundle-RequiredExecutionEnvironment: JavaSE-1.8
- Export-Package: org.eclipse.ua.tests,
- org.eclipse.ua.tests.browser,
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index291/write.lock b/org.eclipse.ua.tests/data/help/searchindex/index291/write.lock
-new file mode 100644
-index 0000000..e69de29
---- /dev/null
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index291/write.lock
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/_0.cfe b/org.eclipse.ua.tests/data/help/searchindex/index510/_0.cfe
-new file mode 100644
-index 0000000..09ec2c9
---- /dev/null
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/_0.cfe
-Binary files differ
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/_0.cfs b/org.eclipse.ua.tests/data/help/searchindex/index510/_0.cfs
-new file mode 100644
-index 0000000..3aa288a
---- /dev/null
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/_0.cfs
-Binary files differ
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/_0.si b/org.eclipse.ua.tests/data/help/searchindex/index510/_0.si
-new file mode 100644
-index 0000000..d897bfc
---- /dev/null
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/_0.si
-Binary files differ
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/segments_1 b/org.eclipse.ua.tests/data/help/searchindex/index510/segments_1
-new file mode 100644
-index 0000000..4878901
---- /dev/null
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/segments_1
-Binary files differ
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/write.lock b/org.eclipse.ua.tests/data/help/searchindex/index510/write.lock
-new file mode 100644
-index 0000000..e69de29
---- /dev/null
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/data/help/searchindex/index510/write.lock
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/EncodedCharacterSearch.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/EncodedCharacterSearch.java
-index 1dd4876..02b2e5b 100644
---- a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/EncodedCharacterSearch.java
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/EncodedCharacterSearch.java
-@@ -7,6 +7,7 @@
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.ua.tests.help.search;
-
-@@ -36,7 +37,7 @@
- @Test
- public void testUtf8Hebrew() {
- SearchTestUtils.searchOneLocale("\u05D0\u05B7\u05E1\u05B0\u05D8\u05B0\u05E8\u05D5\u05B9\u05E0\u05D5\u05B9\u05DE"
-- + "\u05B0\u05D9\u05B8\u05D4) \u05DC\u05B4\u05E7\u05BC\u05D5\u05BC\u05D9 (\u05D9\u05E8\u05D7 \u05D0\u05D5 \u05E9\u05DE\u05E9", new String[] {"/org.eclipse.ua.tests/data/help/search/testnlUTF8.htm" }, "en");
-+ + "\u05B0\u05D9\u05B8\u05D4\\) \u05DC\u05B4\u05E7\u05BC\u05D5\u05BC\u05D9 \\(\u05D9\u05E8\u05D7 \u05D0\u05D5 \u05E9\u05DE\u05E9", new String[] {"/org.eclipse.ua.tests/data/help/search/testnlUTF8.htm" }, "en");
- }
-
-
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
-index 640d4c9..33ae5ba 100644
---- a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
-@@ -22,20 +22,21 @@
- import java.net.URL;
- import java.util.ArrayList;
-
-+import org.apache.lucene.analysis.standard.StandardAnalyzer;
- import org.apache.lucene.index.CorruptIndexException;
--import org.apache.lucene.index.IndexReader;
-+import org.apache.lucene.index.DirectoryReader;
- import org.apache.lucene.search.IndexSearcher;
- import org.apache.lucene.search.Query;
- import org.apache.lucene.search.TopDocs;
- import org.apache.lucene.store.Directory;
- import org.apache.lucene.store.NIOFSDirectory;
-+import org.apache.lucene.util.QueryBuilder;
- import org.eclipse.core.runtime.FileLocator;
- import org.eclipse.core.runtime.NullProgressMonitor;
- import org.eclipse.core.runtime.Path;
- import org.eclipse.help.internal.base.BaseHelpSystem;
- import org.eclipse.help.internal.search.AnalyzerDescriptor;
- import org.eclipse.help.internal.search.PluginIndex;
--import org.eclipse.help.internal.search.QueryBuilder;
- import org.eclipse.help.internal.search.SearchIndexWithIndexingProgress;
- import org.eclipse.ua.tests.plugin.UserAssistanceTestPlugin;
- import org.junit.Test;
-@@ -56,28 +57,12 @@
- public class PrebuiltIndexCompatibility {
-
- /**
-- * Test index built with Lucene 1.9.1
-- */
-- @Test
-- public void test1_9_1_IndexReadable() throws Exception {
-- checkReadable("data/help/searchindex/index191");
-- }
--
-- /**
-- * Test index built with Lucene 2.9.1
-- */
-- @Test
-- public void test2_9_1_IndexReadable() throws Exception {
-- checkReadable("data/help/searchindex/index291");
-- }
--
-- /**
- ** Test compatibility of Lucene 1.9.1 index with current Lucene
- */
- @Test
- public void test1_9_1Compatible()
- {
-- checkCompatible("data/help/searchindex/index191", true);
-+ checkCompatible("data/help/searchindex/index191", false);
- }
-
- /**
-@@ -86,13 +71,13 @@
- @Test
- public void test2_9_1Compatible()
- {
-- checkCompatible("data/help/searchindex/index291", true);
-+ checkCompatible("data/help/searchindex/index291", false);
- }
-
- @Test
- public void test1_9_1LuceneCompatible()
- {
-- checkLuceneCompatible("1.9.1", true);
-+ checkLuceneCompatible("1.9.1", false);
- }
-
- @Test
-@@ -104,7 +89,12 @@
- @Test
- public void test2_9_1LuceneCompatible()
- {
-- checkLuceneCompatible("2.9.1", true);
-+ checkLuceneCompatible("2.9.1", false);
-+ }
-+
-+ @Test
-+ public void test5_1_0LuceneCompatible() {
-+ checkLuceneCompatible("5.1.0", true);
- }
-
- @Test
-@@ -143,6 +133,11 @@
- assertFalse(index1.equals(index2));
- }
-
-+ @Test
-+ public void test5_1_0IndexReadable() throws CorruptIndexException, IOException {
-+ checkReadable("data/help/searchindex/index510");
-+ }
-+
- /*
- * Verifies that a prebuilt index can be searched
- */
-@@ -154,10 +149,11 @@
- URL resolved = FileLocator.resolve(url);
- if ("file".equals(resolved.getProtocol())) { //$NON-NLS-1$
- String filePath = resolved.getFile();
-- QueryBuilder queryBuilder = new QueryBuilder("eclipse", new AnalyzerDescriptor("en-us"));
-- Query luceneQuery = queryBuilder.getLuceneQuery(new ArrayList<String>() , false);
-- try (Directory luceneDirectory = new NIOFSDirectory(new File(filePath));
-- IndexSearcher searcher = new IndexSearcher(IndexReader.open(luceneDirectory, true))) {
-+ StandardAnalyzer standardAnalyzer = new StandardAnalyzer();
-+ QueryBuilder builder = new QueryBuilder(standardAnalyzer);
-+ Query luceneQuery = builder.createBooleanQuery("contents", "eclipse");
-+ try (Directory luceneDirectory = new NIOFSDirectory(new File(filePath).toPath())) {
-+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(luceneDirectory));
- TopDocs hits = searcher.search(luceneQuery, 500);
- assertEquals(hits.totalHits, 1);
- }
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchParticipantTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchParticipantTest.java
-index 223e42a..2e782c3 100644
---- a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchParticipantTest.java
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/SearchParticipantTest.java
-@@ -7,6 +7,7 @@
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
-+ * Sopot Cela - Bug 466829 - Migration to Lucene 5
- *******************************************************************************/
- package org.eclipse.ua.tests.help.search;
-
-@@ -35,7 +36,7 @@
-
- @Test
- public void testSearchUsingAndInSeparateDocs() {
-- SearchTestUtils.searchAllLocales("jduehdye and olhoykk", new String[0]);
-+ SearchTestUtils.searchAllLocales("jduehdye AND olhoykk", new String[0]);
- }
-
- @Test
---- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
-+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
-@@ -101,7 +101,7 @@
- </requirement>
- <requirement>
- <type>eclipse-plugin</type>
-- <id>org.apache.lucene.analysis</id>
-+ <id>org.apache.lucene.analyzers-common</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
index 20ae6c7..a53f741 100644
--- a/eclipse-mockito.patch
+++ b/eclipse-mockito.patch
@@ -14,7 +14,7 @@
org.eclipse.ui.tests.menus
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:44:04.400306048 +0000
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:58:07.608331033 +0000
-@@ -31,8 +31,8 @@
+@@ -32,8 +32,8 @@
org.eclipse.core.expressions;bundle-version="3.4.200",
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
org.eclipse.e4.ui.css.swt;bundle-version="0.11.0",
@@ -38,3 +38,14 @@
org.eclipse.equinox.preferences;bundle-version="3.5.200"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+--- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig 2017-04-04 17:30:21.859313175 +0100
++++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml 2017-04-04 17:30:47.748038958 +0100
+@@ -75,7 +75,7 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.mockito"
++ id="org.mockito.mockito-core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 4b39e83..a8d3e54 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -72,7 +72,7 @@
</execution>
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
-@@ -74,6 +74,13 @@
+@@ -73,6 +73,13 @@
<plugin id="org.eclipse.core.net.linux.x86_64"/>
<plugin id="org.eclipse.core.net.win32.x86"/>
<plugin id="org.eclipse.core.net.win32.x86_64"/>
@@ -113,15 +113,14 @@
</execution>
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
-@@ -54,6 +54,21 @@
- <plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
+@@ -46,6 +46,20 @@
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
+ <plugin id="org.apache.commons.jxpath" />
-+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
+ <plugin id="org.apache.felix.gogo.command" />
+ <plugin id="org.apache.batik.css" />
+ <plugin id="org.w3c.css.sac" />
@@ -144,12 +143,12 @@
- <requires>
- <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
- <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
-- <import feature="org.eclipse.ecf.core.source.feature" version="1.1.0" match="compatible"/>
-- <import feature="org.eclipse.ecf.core.ssl.source.feature" version="1.0.0" match="compatible"/>
-- <import feature="org.eclipse.ecf.filetransfer.source.feature" version="3.9.0" match="compatible"/>
-- <import feature="org.eclipse.ecf.filetransfer.httpclient4.source.feature" version="3.8.0" match="compatible"/>
-- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" version="1.0.0" match="compatible"/>
-- <import feature="org.eclipse.ecf.filetransfer.ssl.source.feature" version="1.0.0" match="compatible"/>
+- <import feature="org.eclipse.ecf.core.feature.source" version="1.3.0" match="compatible"/>
+- <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
+- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.3" match="compatible"/>
+- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.3" match="compatible"/>
+- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
+- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
- </requires>
<plugin
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index a478ce5..703e6c8 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -29,11 +29,22 @@ index 7e1f520..734dd10 100644
<plugin
id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -597,6 +627,28 @@
+@@ -597,6 +627,39 @@
version="0.0.0"
fragment="true"
unpack="false"/>
-+
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.s390x"
++ os="linux"
++ ws="gtk"
++ arch="s390x"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
+ <plugin
+ id="org.eclipse.swt.gtk.linux.arm"
+ os="linux"
@@ -58,65 +69,14 @@ index 7e1f520..734dd10 100644
<plugin
id="org.eclipse.swt.gtk.linux.ppc"
-diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-index 29d3871..45526c8 100644
---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-@@ -119,6 +125,16 @@
- defaultJava=DEFAULT_JAVA_EXEC
- OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
- ;;
-+ arm*)
-+ defaultOSArch="arm"
-+ defaultJava=DEFAULT_JAVA_EXEC
-+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-+ ;;
-+ "aarch64")
-+ defaultOSArch="aarch64"
-+ defaultJava=DEFAULT_JAVA_EXEC
-+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-+ ;;
- *)
- echo "*** Unknown MODEL <${MODEL}>"
- ;;
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000
-@@ -219,6 +219,128 @@
+@@ -349,6 +349,68 @@
</plugins>
</build>
</profile>
+
+ <profile>
-+ <id>build-native-launchers-gtk.linux.ppc</id>
-+ <activation>
-+ <property>
-+ <name>native</name>
-+ <value>gtk.linux.ppc</value>
-+ </property>
-+ </activation>
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <artifactId>maven-antrun-plugin</artifactId>
-+ <executions>
-+ <execution>
-+ <id>compile-executable-natives</id>
-+ <phase>generate-resources</phase>
-+ <configuration>
-+ <target>
-+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
-+ </target>
-+ </configuration>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ </execution>
-+ </executions>
-+ </plugin>
-+ </plugins>
-+ </build>
-+ </profile>
-+ <profile>
+ <id>build-native-launchers-gtk.linux.ppc64</id>
+ <activation>
+ <property>
@@ -176,57 +136,37 @@ index 29d3871..45526c8 100644
+ </plugins>
+ </build>
+ </profile>
-+ <profile>
-+ <id>build-native-launchers-gtk.linux.s390</id>
-+ <activation>
-+ <property>
-+ <name>native</name>
-+ <value>gtk.linux.s390</value>
-+ </property>
-+ </activation>
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <artifactId>maven-antrun-plugin</artifactId>
-+ <executions>
-+ <execution>
-+ <id>compile-executable-natives</id>
-+ <phase>generate-resources</phase>
-+ <configuration>
-+ <target>
-+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
-+ </target>
-+ </configuration>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ </execution>
-+ </executions>
-+ </plugin>
-+ </plugins>
-+ </build>
-+ </profile>
+
<profile>
<id>build-native-launchers-win32.win32.x86_64</id>
<activation>
-@@ -347,8 +530,6 @@
- <include name="gtk/solaris/sparcv9/**/*"/>
- <include name="win32/win32/x86/**/*"/>
- <include name="win32/win32/x86_64/**/*"/>
-- </fileset>
-- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
- <include name="gtk/linux/s390/**/*"/>
- <include name="gtk/linux/s390x/**/*"/>
- </fileset>
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
-@@ -59,4 +59,8 @@
- root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
- root.linux.gtk.s390.permissions.755=launcher
+@@ -40,3 +40,12 @@
+ root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
+ root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
++
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
+root.linux.gtk.aarch64.permissions.755=launcher
++
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
+root.linux.gtk.arm.permissions.755=launcher
++
++root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
++root.linux.gtk.s390x.permissions.755=launcher
+--- a/eclipse.platform.swt.binaries/pom.xml 2017-04-05 01:57:59.142576722 +0100
++++ b/eclipse.platform.swt.binaries/pom.xml 2017-04-05 02:00:00.153247342 +0100
+@@ -55,9 +55,12 @@
+ <modules>
+ <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
++ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
++ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.ppc</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
++ <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
+ <module>bundles/org.eclipse.swt.win32.win32.x86</module>
diff --git a/eclipse-support-symlink-bundles.patch b/eclipse-support-symlink-bundles.patch
index dee043b..443092e 100644
--- a/eclipse-support-symlink-bundles.patch
+++ b/eclipse-support-symlink-bundles.patch
@@ -29,11 +29,9 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/
index ab69b88..d6bf121 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
-@@ -13,9 +13,14 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
-
- import java.io.*;
+@@ -15,8 +15,12 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
import java.net.*;
-+import java.nio.file.*;
+ import java.nio.file.Files;
import java.util.*;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
@@ -51,7 +49,7 @@ index ab69b88..d6bf121 100644
URI location = parseLocation(tok.nextToken().trim());
+ if (base != null) {
+ URI absLoc = URIUtil.append(base, location.toString());
-+ Path absPath = Paths.get(absLoc);
++ java.nio.file.Path absPath = java.nio.file.Paths.get(absLoc);
+ // Symbolic links may change outside Eclipse so regenerate proper bundle version.
+ if (Files.isSymbolicLink(absPath) && absPath.toFile().isFile()) {
+ // We can't depend on org.eclipse.equinox.internal.frameworkadmin.utils.Utils
diff --git a/eclipse-swt-disable-gtk2.patch b/eclipse-swt-disable-gtk2.patch
new file mode 100644
index 0000000..5517871
--- /dev/null
+++ b/eclipse-swt-disable-gtk2.patch
@@ -0,0 +1,25 @@
+--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig
++++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+@@ -898,15 +898,19 @@
+ </not>
+ </condition>
+ <antcall target="init_build"/>
++ <antcall target="build_gtk2"/>
++ <antcall target="build_gtk3"/>
++ <delete dir="${build_dir}" quiet="true"/>
++ <antcall target="refresh_fragment"/>
++ </target>
++
++ <target name="build_gtk2" if="machine_gtk2">
+ <antcall target="${build_task}">
+ <param name="build_targets" value="${targets}"/>
+ <param name="build_machine" value="${machine}"/>
+ <param name="port" value="${port}"/>
+ <param name="keyfile" value="${keyfile}"/>
+ </antcall>
+- <antcall target="build_gtk3"/>
+- <delete dir="${build_dir}" quiet="true"/>
+- <antcall target="refresh_fragment"/>
+ </target>
+
+ <target name="build_gtk3" if="machine_gtk3">
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 8fa87f3..26976ad 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -201,7 +201,7 @@
echo "command line as passed into $(basename ${0}): ${*}"
echo "command line (quoted) as passed into $(basename ${0}): ${@}"
-@@ -159,6 +198,8 @@
+@@ -166,6 +205,8 @@
if [[ "true" == "${START_WINDOW_MGT}" ]]
then
./startWindowManager.sh
@@ -210,7 +210,7 @@
fi
# During production tests, we define 'testedPlatform' as a combination of
-@@ -192,6 +233,7 @@
+@@ -199,6 +240,7 @@
echo "platformString: ${platformString}"
echo "testedPlatform: ${testedPlatform}"
@@ -218,7 +218,7 @@
# -Dtimeout=300000 "${ANT_OPTS}"
if [[ -n "${extdirproperty}" ]]
then
-@@ -202,4 +244,4 @@
+@@ -209,4 +251,4 @@
$jvm ${ANT_OPTS} ${platformArgString} -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml ${ANT_OPTS} ${platformParmString} -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger $tests 2>&1 | tee $consolelogs
fi
diff --git a/eclipse.spec b/eclipse.spec
index 17770a1..f82fbdf 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -5,22 +5,11 @@
Epoch: 1
-%global eb_commit a8c4189f4b7af192e2295b27aef74300ac3bfce9
-%global eclipse_tag S4_6_3_RC4
+%global eb_commit 4bb6dae1336990aa3fe29be55f99869f091f6e44
+%global eclipse_tag I20170404-0245
-%if 0%{?fedora} >= 26
-%global _jetty_version 9.4.2
-%global _lucene_version 5.5.0
-%else
-%if 0%{?fedora} >= 25
-%global _jetty_version 9.4.0
-%global _lucene_version 5.5.0
-%else
-# Used on RHEL
-%global _jetty_version 9.0.3
-%global _lucene_version 5.4.1
-%endif
-%endif
+%global _jetty_version 9.4.3
+%global _lucene_version 6.1.0
%ifarch %{ix86}
%global eclipse_arch x86
@@ -31,7 +20,7 @@ Epoch: 1
%ifarch ppc64 ppc64p7
%global eclipse_arch ppc64
%endif
-%ifarch s390 s390x ppc x86_64 aarch64 ppc64le
+%ifarch s390 s390x x86_64 aarch64 ppc64le
%global eclipse_arch %{_arch}
%endif
@@ -40,14 +29,16 @@ Epoch: 1
%global app_exec %{?app_exec_prefix} eclipse
# See fedora-devel-java-list discussion in September 2008.
-#
# Prevent brp-java-repack-jars from being run.
%global __jar_repack %{nil}
+# Eclipse is arch-specific, but multilib agnostic
+%global _eclipsedir %{_prefix}/lib/eclipse
+
Summary: An open, extensible IDE
Name: eclipse
-Version: 4.6.3
-Release: 3%{?dist}
+Version: 4.7.0
+Release: 0.1%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -75,9 +66,9 @@ Patch4: eclipse-ignore-version-when-calculating-home.patch
# just source, and we don't want additional dependencies.
Patch5: eclipse-remove-jgit-provider.patch
-Patch8: eclipse-test-support.patch
+Patch6: eclipse-test-support.patch
-Patch9: eclipse-secondary-arches.patch
+Patch7: eclipse-secondary-arches.patch
Patch10: eclipse-debug-symbols.patch
@@ -98,20 +89,17 @@ Patch15: eclipse-support-symlink-bundles.patch
# If plugin is external, updating it breaks the feature. (version changes)
# Workaround : Change <plugin> definition to a 'requirement'
# Also makes the following BSN changes at the same time:
-# -com.sun.el
-# +javax.el
-# -org.apache.jasper.glassfish
-# +org.glassfish.web.javax.servlet.jsp
-# -javax.annotation
-# -org.w3c.dom.smil
+# com.sun.el -> com.sun.el.javax.el
+# javax.el -> javax.el-api
+# javax.servlet -> javax.servlet-api
+# org.apache.jasper.glassfish -> org.glassfish.web.javax.servlet.jsp
+# javax.annotation -> removed
+# org.w3c.dom.smil -> removed
Patch16: eclipse-feature-plugins-to-category-ius.patch
# Disable non-linux specific bundles to save build time
Patch17: disable-non-linux.patch
-# Port to Lucene 5
-Patch18: eclipse-lucene-5.patch
-
# Fix various JDT and PDE tests
Patch20: eclipse-fix-tests.patch
@@ -122,8 +110,8 @@ Patch22: eclipse-pde-tp-support-droplets.patch
# Use webkit2 by default and prevent usage of xulrunner
Patch23: eclipse-webkit2-by-default.patch
-# Port to jetty 9.4
-Patch24: eclipse-jetty-9.4.patch
+# Only build gtk3 backend for SWT
+Patch24: eclipse-swt-disable-gtk2.patch
# Droplet fixes
Patch26: eclipse-make-droplets-runnable.patch
@@ -161,22 +149,24 @@ BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(webkitgtk-3.0)
-%if ! 0%{?rhel}
+%if 0%{?rhel}
# RHEL does not have webkit2
+BuildRequires: pkgconfig(webkitgtk-3.0)
+%else
BuildRequires: pkgconfig(webkit2gtk-4.0)
%endif
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
+BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
+BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
BuildRequires: jsch >= 0:0.1.46-2
BuildRequires: apache-commons-el >= 1.0-22
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-jxpath
BuildRequires: apache-commons-fileupload
-BuildRequires: felix-gogo-command
-BuildRequires: felix-gogo-shell
+BuildRequires: osgi(org.apache.felix.gogo.shell)
+BuildRequires: osgi(org.apache.felix.gogo.command)
+BuildRequires: osgi(org.apache.felix.scr) >= 2.0.8
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
@@ -185,6 +175,7 @@ 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}
@@ -256,14 +247,16 @@ Summary: Eclipse platform common files
Recommends: eclipse-abrt
Recommends: eclipse-usage
-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-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
+Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
+Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
+Requires: jsch >= 0.1.46-2
Requires: apache-commons-el >= 1.0-23
Requires: apache-commons-logging
Requires: apache-commons-codec
Requires: apache-commons-jxpath
-Requires: felix-gogo-command
-Requires: felix-gogo-shell
+Requires: osgi(org.apache.felix.gogo.shell)
+Requires: osgi(org.apache.felix.gogo.command)
+Requires: osgi(org.apache.felix.scr) >= 2.0.8
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
@@ -271,8 +264,8 @@ 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: jsch >= 0.1.46-2
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}
@@ -325,9 +318,6 @@ Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: objectweb-asm >= 5.0.3-1
Recommends: eclipse-e4-importer
-# For PDE Build wrapper script + creating jars
-Requires: zip
-Requires: bash
%description pde
Eclipse Plugin Development Environment. This package is required for
@@ -375,8 +365,8 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch3
%patch4
%patch5
-%patch8
-%patch9 -p1
+%patch6
+%patch7 -p1
%patch10
%patch11
%patch12
@@ -385,7 +375,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch15
%patch16
%patch17
-%patch18 -p1
%patch20
%patch21
%patch22
@@ -393,9 +382,7 @@ tar --strip-components=1 -xf %{SOURCE1}
# RHEL does not have webkit2
%patch23
%endif
-%if 0%{?fedora} >= 25
%patch24
-%endif
%patch26
%patch27
%patch28
@@ -410,9 +397,6 @@ sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platf
# Resolving the target platform requires too many changes, so don't use it
%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent
-# Unnecessary plugin
-%pom_remove_plugin "org.codehaus.mojo:properties-maven-plugin" eclipse-platform-parent
-
# Disable as many products as possible to make the build faster, we care only for the IDE
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
@@ -444,7 +428,7 @@ sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platf
%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2
%pom_disable_module bundles/ie.wombat.jbdiff rt.equinox.p2
%pom_disable_module bundles/ie.wombat.jbdiff.test rt.equinox.p2
-%pom_disable_module tests/com.google.code.atinject.tck eclipse.platform.runtime
+%pom_disable_module com.google.code.atinject.tck eclipse.platform.runtime/tests
# Disable examples
%pom_disable_module bundles/org.eclipse.sdk.examples eclipse.platform.releng
@@ -482,7 +466,7 @@ for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt
if [ -n "$module" ] ; then
%pom_disable_module bundles/$b eclipse.platform.swt.binaries
%pom_xpath_inject "pom:excludes" "<plugin id='$b'/>" eclipse.platform.ui/features/org.eclipse.e4.rcp
- %pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+ %pom_xpath_remove "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
fi
done
for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do
@@ -511,14 +495,16 @@ done
%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.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/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 org.eclipse.e4.ui.workbench.renderers.swt.cocoa eclipse.platform.ui/bundles
+%pom_disable_module org.eclipse.ui.cocoa eclipse.platform.ui/bundles
+%pom_disable_module org.eclipse.ui.win32 eclipse.platform.ui/bundles
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
+# We don't need SWT fragments since we only care for current arch
+%pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt
+%pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests
+
# Disable contributor tools that have external dependencies during bootstrap
%if %{bootstrap}
%pom_disable_module eclipse.platform.ui.tools
@@ -596,19 +582,12 @@ popd
# Allow usage of javax.servlet.jsp 2.3.
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
-# Use com.sun.el.java.el (Glassfish) instead of javax.el (Tomcat)
-sed -i 's/javax\.el/javax\.el-api/' \
- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \
- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
-sed -i '/javax\.el-api/a<import plugin="com.sun.el.javax.el" \/>' \
- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
-
# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
-sed -i -e "s|<id>javax.servlet</id>|<id>javax.servlet-api</id>|g" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.eclipse.equinox.http.{jetty9,servlet}/META-INF/MANIFEST.MF
-%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
+# Pre-compiling JSPs does not currently work
+%pom_remove_plugin org.eclipse.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
# Remove generated files not present during bootstrap build
# org.eclipse.platform.doc.isv, org.eclipse.jdt.doc.isv, org.eclipse.pde.doc.user
@@ -616,12 +595,10 @@ sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.e
sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
%endif
-# Remove some problem comments that cause a failure
-sed -i -e '/<dl>/,/<dl>/d' eclipse.jdt.core/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/Checks.java
-
# Use system osgi.annotation lib
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi/osgi/
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/
+ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.util/lib/
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/osgi/
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
@@ -654,8 +631,8 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
%build
#This is the lowest value where the build succeeds. 512m is not enough.
-export MAVEN_OPTS="-Xmx1000m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-export JAVA_HOME=%{java_home}
+export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
+export JAVA_HOME=%{_jvmdir}/java
# Qualifier generated from last modification time of source tarball
QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
@@ -675,7 +652,7 @@ product="eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/or
dependencies/fake_ant_dependency.sh $product/eclipse/plugins/org.apache.ant_*
# Symlink necessary plugins that are provided by other packages
-dependencies/replace_platform_plugins_with_symlinks.sh $product/eclipse %{_javadir}
+dependencies/replace_platform_plugins_with_symlinks.sh $product/eclipse %{_javadir} %{_jnidir}
pushd $product/eclipse
@@ -704,9 +681,8 @@ sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini
sed -i '1i-protect\nmaster' eclipse.ini
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
-cat >> eclipse.ini <<EOFINI
+cat >> eclipse.ini <<EOF
-Dorg.eclipse.swt.browser.UseWebKitGTK=true
--Dhelp.lucene.tokenizer=standard
-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
@@ -714,10 +690,10 @@ cat >> eclipse.ini <<EOFINI
-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
--Dp2.fragments=%{_datadir}/eclipse/droplets,%{_libdir}/eclipse/droplets
+-Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
-Declipse.p2.skipMovedInstallDetection=true
-Dosgi.framework.extensions=org.eclipse.wst.jsdt.nashorn.extension
-EOFINI
+EOF
popd #eclipse
@@ -760,51 +736,51 @@ pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.e
for i in `ls | grep "profile.gz"` ; do \
echo $i ; \
gunzip $i ; \
- sed -i -e "s@${LOCAL_PWD}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse@%{_libdir}/eclipse(a)g" *.profile ; \
+ sed -i -e "s@${LOCAL_PWD}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse@%{_eclipsedir}(a)g" *.profile ; \
gzip *.profile ; \
done
popd
#installation itself - copy it into right location
rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse \
- $RPM_BUILD_ROOT%{_libdir}
-
-# Symlink eclipse binary
-pushd $RPM_BUILD_ROOT%{_bindir}
- ln -s %{_libdir}/eclipse/eclipse
-popd
+ $RPM_BUILD_ROOT%{_prefix}/lib
# SWT is a directory, but we need to provide jars for others that depend on it
-pushd $RPM_BUILD_ROOT/%{_libdir}/eclipse/plugins
+pushd $RPM_BUILD_ROOT/%{_eclipsedir}/plugins
SWT_JAR=$(ls | grep swt.gtk.linux)
(cd ${SWT_JAR} && zip -r "../../swt.jar" * )
popd
# Symlink SWT jar
pushd $RPM_BUILD_ROOT/%{_jnidir}/
- ln -s $(abs2rel %{_libdir}/eclipse/swt.jar %{_jnidir})
+ ln -s $(abs2rel %{_eclipsedir}/swt.jar %{_jnidir})
+popd
+
+# Symlink eclipse binary
+pushd $RPM_BUILD_ROOT%{_bindir}
+ ln -s %{_eclipsedir}/eclipse
popd
# Symlink eclipse ini
pushd $RPM_BUILD_ROOT/%{_sysconfdir}/
- ln -s %{_libdir}/eclipse/eclipse.ini
+ ln -s %{_eclipsedir}/eclipse.ini
popd
# List jars to be symlinked into javadir
-pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins
-EQUINOX_JARS=$(ls . | grep '^org.eclipse.equinox' | sed -e 's|^org\.eclipse\.\(.*\)_.*|\1|')
+pushd $RPM_BUILD_ROOT%{_eclipsedir}/plugins
+EQUINOX_JARS=$(ls . | grep -P '^org.eclipse.equinox(?!.*\.ui[\._])' | sed -e 's|^org\.eclipse\.\(.*\)_.*|\1|')
OSGI_JARS=$(ls . | grep '^org.eclipse.osgi' | sed -e 's|^org\.eclipse\.\(.*\)_.*|\1|')
popd
# Symlink jars into javadir
for J in $EQUINOX_JARS $OSGI_JARS core.contenttype core.jobs core.net core.runtime ; do
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
- DIR=%{?scl:../../../../}../../../..%{_libdir}/eclipse
+ DIR=%{?scl:../../../../}../../../..%{_eclipsedir}
[ -e "`ls $DIR/plugins/org.eclipse.${J}_*.jar`" ] && ln -s $DIR/plugins/org.eclipse.${J}_*.jar ${J}.jar
popd
# Install pom file if there is one
if [ -e "externalpoms/org.eclipse.${J}.pom" ] ; then
- VER=$(echo $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.${J}_*.jar | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
+ VER=$(echo $RPM_BUILD_ROOT%{_eclipsedir}/plugins/org.eclipse.${J}_*.jar | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
sed -i -e "s/@VERSION@/$VER/" externalpoms/org.eclipse.${J}.pom
install -m 0644 externalpoms/org.eclipse.${J}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.eclipse-${J}.pom
fi
@@ -817,7 +793,7 @@ done
%add_maven_depmap JPP.eclipse-osgi.util.pom eclipse/osgi.util.jar -a "org.eclipse.osgi:util" -f equinox-osgi
%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom eclipse/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
# Maven metadata for SWT (no POM)
-VER=$(echo $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/")
+VER=$(echo $RPM_BUILD_ROOT%{_eclipsedir}/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/")
%add_maven_depmap org.eclipse.swt:org.eclipse.swt:$VER swt.jar -a org.eclipse.swt:swt -f swt
##############
@@ -837,34 +813,6 @@ unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $
cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
-pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/plugins
- f=`ls | grep -e "^com.google.code.atinject.tck_"`
- rm -rf $f
- ln -s $(build-classpath atinject-tck) ${f%.jar}.jar
- f=`ls | grep -e "^org.apache.commons.fileupload_"`
- rm -rf $f
- ln -s $(build-classpath apache-commons-fileupload) ${f%.jar}.jar
- f=`ls | grep -e "^org.apache.commons.io_"`
- rm -rf $f
- ln -s $(build-classpath apache-commons-io) ${f%.jar}.jar
- f=`ls | grep -e "^org.mockito.mockito-core_"`
- rm -rf $f
- ln -s $(build-classpath mockito/mockito-core) ${f%.jar}.jar
- f=`ls | grep -e "^net.sf.cglib.core_"`
- rm -rf $f
- ln -s $(build-classpath cglib/cglib) ${f%.jar}.jar
- f=`ls | grep -e "^org.objenesis_"`
- rm -rf $f
- ln -s $(build-classpath objenesis/objenesis) ${f%.jar}.jar
- for ham in core library integration ; do
- f=`ls | grep -e "^org.hamcrest.${ham}_"`
- rm -rf $f
- ln -s $(build-classpath hamcrest/${ham}) ${f%.jar}.jar
- done
- # These are already present in the platform
- rm -rf org.junit_*
-popd
-
# These properties are not correct and nested properties won't get resolved
sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/equinoxp2tests.properties
@@ -873,11 +821,11 @@ cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/tes
mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
#fix so permissions
-find $RPM_BUILD_ROOT/%{_libdir}/eclipse -name *.so -exec chmod a+x {} \;
+find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \;
# Usage marker
-install -d -m 755 %{buildroot}%{_libdir}/eclipse/.pkgs
-echo "%{version}-%{release}" > %{buildroot}%{_libdir}/eclipse/.pkgs/Distro%{?dist}
+install -d -m 755 %{buildroot}%{_eclipsedir}/.pkgs
+echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%post platform
touch --no-create /usr/share/icons/hicolor
@@ -892,197 +840,189 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
fi
%files swt -f .mfiles-swt
-%{_libdir}/eclipse/plugins/org.eclipse.swt_*
-%{_libdir}/eclipse/plugins/org.eclipse.swt.gtk.linux.*
-%{_libdir}/eclipse/swt.jar
+%{_eclipsedir}/plugins/org.eclipse.swt_*
+%{_eclipsedir}/plugins/org.eclipse.swt.gtk.linux.*
+%{_eclipsedir}/swt.jar
%{_jnidir}/swt.jar
%files platform -f .mfiles-platform
%{_bindir}/eclipse
-%{_libdir}/eclipse/.eclipseproduct
-%{_libdir}/eclipse/.pkgs
-%config %{_libdir}/%{name}/eclipse.ini
+%{_eclipsedir}/eclipse
+%{_eclipsedir}/.eclipseproduct
+%{_eclipsedir}/.pkgs
+%config %{_eclipsedir}/eclipse.ini
%config %{_sysconfdir}/eclipse.ini
/usr/share/applications/*
/usr/share/pixmaps/*
/usr/share/icons/*/*/apps/*
%{_datadir}/appdata/eclipse.appdata.xml
-%{_libdir}/%{name}/eclipse
-%dir %{_libdir}/%{name}/configuration/
-%dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/
-%{_libdir}/%{name}/configuration/config.ini
-%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-%{_libdir}/%{name}/features/org.eclipse.core.runtime.feature_*
-%{_libdir}/%{name}/features/org.eclipse.e4.rcp_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.core.feature_*
-%{_libdir}/%{name}/features/org.eclipse.help_*
-%{_libdir}/%{name}/features/org.eclipse.platform_*
-%{_libdir}/%{name}/features/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/com.ibm.icu_*
-%if 0%{?fedora} >= 24
-%{_libdir}/%{name}/plugins/com.spatial4j_*
-%endif
-%{_libdir}/%{name}/plugins/com.jcraft.jsch_*
-%{_libdir}/%{name}/plugins/javax.servlet-api_*
-%{_libdir}/%{name}/plugins/javax.servlet.jsp_*
-%{_libdir}/%{name}/plugins/javax.xml_*
-%{_libdir}/%{name}/plugins/javax.el-api_*
-%{_libdir}/%{name}/plugins/com.sun.el.javax.el_*
-%{_libdir}/%{name}/plugins/javax.inject_*.jar
-%{_libdir}/%{name}/plugins/org.apache.*
-%{_libdir}/%{name}/plugins/org.glassfish.web.javax.servlet.jsp_*
-%{_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.commands_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.externaltools_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem*
-%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.net*
-%{_libdir}/%{name}/plugins/org.eclipse.core.resources_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*
-%{_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.ds_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.event_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.registry_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
-%{_libdir}/%{name}/plugins/org.eclipse.help_*
-%{_libdir}/%{name}/plugins/org.eclipse.help.base_*
-%{_libdir}/%{name}/plugins/org.eclipse.help.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.compiler.batch_*
-%{_libdir}/%{name}/plugins/org.eclipse.jface_*
-%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
-%{_libdir}/%{name}/plugins/org.eclipse.jface.text_*
-%{_libdir}/%{name}/plugins/org.eclipse.jsch.core_*
-%{_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.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_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.console_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.ide_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.ide.application_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.intro_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.quicklinks_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.universal_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.monitoring_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.net_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.themes_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.views_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.commands_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.contexts_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.annotations_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.extensions_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.services_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.emf.xpath_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.bindings_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.di_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.dialogs_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.model.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.services_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.swt.gtk_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.widgets_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench3_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.util_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.server_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.http_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.continuation_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.io_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.security_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.servlet_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.core.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.extras.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.rcp.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.engine_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.jarprocessor_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.repository_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.artifact.repository_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.operations_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.transport.ecf_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.importexport_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.garbagecollector_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.directorywatcher_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository.tools_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatesite_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.security_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.security.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.extensionlocation_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director.app_*
-%{_libdir}/%{name}/plugins/org.sat4j.core_*
-%{_libdir}/%{name}/plugins/org.sat4j.pb_*
-%{_libdir}/%{name}/plugins/org.tukaani.xz_*
-%{_libdir}/%{name}/plugins/org.w3c.css.sac_*
-%{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.concurrent_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.console_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.util_*
-%{_libdir}/%{name}/plugins/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
-%{_libdir}/%{name}/readme
-%{_libdir}/%{name}/artifacts.xml
-%{_libdir}/%{name}/p2
+%dir %{_eclipsedir}/configuration/
+%dir %{_eclipsedir}/configuration/org.eclipse.equinox.simpleconfigurator/
+%{_eclipsedir}/configuration/config.ini
+%{_eclipsedir}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+%{_eclipsedir}/features/org.eclipse.core.runtime.feature_*
+%{_eclipsedir}/features/org.eclipse.e4.rcp_*
+%{_eclipsedir}/features/org.eclipse.equinox.core.feature_*
+%{_eclipsedir}/features/org.eclipse.equinox.p2.core.feature_*
+%{_eclipsedir}/features/org.eclipse.equinox.p2.extras.feature_*
+%{_eclipsedir}/features/org.eclipse.equinox.p2.rcp.feature_*
+%{_eclipsedir}/features/org.eclipse.equinox.p2.user.ui_*
+%{_eclipsedir}/features/org.eclipse.help_*
+%{_eclipsedir}/features/org.eclipse.platform_*
+%{_eclipsedir}/features/org.eclipse.rcp_*
+%{_eclipsedir}/plugins/com.ibm.icu_*
+%{_eclipsedir}/plugins/com.jcraft.jsch_*
+%{_eclipsedir}/plugins/com.sun.el.javax.el_*
+%{_eclipsedir}/plugins/javax.*
+%{_eclipsedir}/plugins/org.apache.*
+%{_eclipsedir}/plugins/org.eclipse.ant.core_*
+%{_eclipsedir}/plugins/org.eclipse.compare_*
+%{_eclipsedir}/plugins/org.eclipse.compare.core_*
+%{_eclipsedir}/plugins/org.eclipse.core.commands_*
+%{_eclipsedir}/plugins/org.eclipse.core.contenttype_*
+%{_eclipsedir}/plugins/org.eclipse.core.databinding.beans_*
+%{_eclipsedir}/plugins/org.eclipse.core.databinding.observable_*
+%{_eclipsedir}/plugins/org.eclipse.core.databinding.property_*
+%{_eclipsedir}/plugins/org.eclipse.core.databinding_*
+%{_eclipsedir}/plugins/org.eclipse.core.expressions_*
+%{_eclipsedir}/plugins/org.eclipse.core.externaltools_*
+%{_eclipsedir}/plugins/org.eclipse.core.filebuffers_*
+%{_eclipsedir}/plugins/org.eclipse.core.filesystem*
+%{_eclipsedir}/plugins/org.eclipse.core.jobs_*
+%{_eclipsedir}/plugins/org.eclipse.core.net*
+%{_eclipsedir}/plugins/org.eclipse.core.resources_*
+%{_eclipsedir}/plugins/org.eclipse.core.runtime_*
+%{_eclipsedir}/plugins/org.eclipse.core.variables_*
+%{_eclipsedir}/plugins/org.eclipse.debug.core_*
+%{_eclipsedir}/plugins/org.eclipse.debug.ui_*
+%{_eclipsedir}/plugins/org.eclipse.e4.core.commands_*
+%{_eclipsedir}/plugins/org.eclipse.e4.core.contexts_*
+%{_eclipsedir}/plugins/org.eclipse.e4.core.di_*
+%{_eclipsedir}/plugins/org.eclipse.e4.core.di.annotations_*
+%{_eclipsedir}/plugins/org.eclipse.e4.core.di.extensions_*
+%{_eclipsedir}/plugins/org.eclipse.e4.core.di.extensions.supplier_*
+%{_eclipsedir}/plugins/org.eclipse.e4.core.services_*
+%{_eclipsedir}/plugins/org.eclipse.e4.emf.xpath_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.bindings_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.core_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.swt_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.css.swt.theme_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.di_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.dialogs_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.model.workbench_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.services_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.swt.gtk_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.widgets_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench3_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
+%{_eclipsedir}/plugins/org.eclipse.e4.ui.workbench.swt_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.app_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.bidi_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.common_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.concurrent_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.console_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.ds_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.event_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.frameworkadmin_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.http.jetty_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.http.registry_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.http.servlet_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.jsp.jasper_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.launcher_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.artifact.repository_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.console_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.core_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.director_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.director.app_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.directorywatcher_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.engine_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.extensionlocation_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.garbagecollector_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.jarprocessor_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.metadata_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.metadata.repository_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.operations_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.publisher_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.repository_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.repository.tools_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.transport.ecf_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.importexport_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.sdk_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.updatechecker_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.p2.updatesite_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.preferences_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.registry_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.security_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.security.ui_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
+%{_eclipsedir}/plugins/org.eclipse.equinox.util_*
+%{_eclipsedir}/plugins/org.eclipse.help_*
+%{_eclipsedir}/plugins/org.eclipse.help.base_*
+%{_eclipsedir}/plugins/org.eclipse.help.ui_*
+%{_eclipsedir}/plugins/org.eclipse.help.webapp_*
+%{_eclipsedir}/plugins/org.eclipse.jdt.core.compiler.batch_*
+%{_eclipsedir}/plugins/org.eclipse.jetty.*
+%{_eclipsedir}/plugins/org.eclipse.jface_*
+%{_eclipsedir}/plugins/org.eclipse.jface.databinding_*
+%{_eclipsedir}/plugins/org.eclipse.jface.text_*
+%{_eclipsedir}/plugins/org.eclipse.jsch.core_*
+%{_eclipsedir}/plugins/org.eclipse.jsch.ui_*
+%{_eclipsedir}/plugins/org.eclipse.ltk.core.refactoring_*
+%{_eclipsedir}/plugins/org.eclipse.ltk.ui.refactoring_*
+%{_eclipsedir}/plugins/org.eclipse.platform_*
+%{_eclipsedir}/plugins/org.eclipse.platform.doc.user_*
+%{_eclipsedir}/plugins/org.eclipse.rcp_*
+%{_eclipsedir}/plugins/org.eclipse.search_*
+%{_eclipsedir}/plugins/org.eclipse.team.core_*
+%{_eclipsedir}/plugins/org.eclipse.team.genericeditor.diff.extension_*
+%{_eclipsedir}/plugins/org.eclipse.team.ui_*
+%{_eclipsedir}/plugins/org.eclipse.text_*
+%{_eclipsedir}/plugins/org.eclipse.ui_*
+%{_eclipsedir}/plugins/org.eclipse.ui.browser_*
+%{_eclipsedir}/plugins/org.eclipse.ui.cheatsheets_*
+%{_eclipsedir}/plugins/org.eclipse.ui.console_*
+%{_eclipsedir}/plugins/org.eclipse.ui.editors_*
+%{_eclipsedir}/plugins/org.eclipse.ui.externaltools_*
+%{_eclipsedir}/plugins/org.eclipse.ui.forms_*
+%{_eclipsedir}/plugins/org.eclipse.ui.genericeditor_*
+%{_eclipsedir}/plugins/org.eclipse.ui.ide_*
+%{_eclipsedir}/plugins/org.eclipse.ui.ide.application_*
+%{_eclipsedir}/plugins/org.eclipse.ui.intro_*
+%{_eclipsedir}/plugins/org.eclipse.ui.intro.quicklinks_*
+%{_eclipsedir}/plugins/org.eclipse.ui.intro.universal_*
+%{_eclipsedir}/plugins/org.eclipse.ui.monitoring_*
+%{_eclipsedir}/plugins/org.eclipse.ui.navigator_*
+%{_eclipsedir}/plugins/org.eclipse.ui.navigator.resources_*
+%{_eclipsedir}/plugins/org.eclipse.ui.net_*
+%{_eclipsedir}/plugins/org.eclipse.ui.themes_*
+%{_eclipsedir}/plugins/org.eclipse.ui.views_*
+%{_eclipsedir}/plugins/org.eclipse.ui.views.properties.tabbed_*
+%{_eclipsedir}/plugins/org.eclipse.ui.workbench_*
+%{_eclipsedir}/plugins/org.eclipse.ui.workbench.texteditor_*
+%{_eclipsedir}/plugins/org.eclipse.update.configurator_*
+%{_eclipsedir}/plugins/org.glassfish.web.javax.servlet.jsp_*
+%{_eclipsedir}/plugins/org.kxml2_*
+%{_eclipsedir}/plugins/org.sat4j.core_*
+%{_eclipsedir}/plugins/org.sat4j.pb_*
+%{_eclipsedir}/plugins/org.tukaani.xz_*
+%{_eclipsedir}/plugins/org.w3c.css.sac_*
+%{_eclipsedir}/plugins/org.w3c.dom.svg_*
+%{_eclipsedir}/plugins/org.xmlpull_*
+%doc %{_eclipsedir}/readme
+%{_eclipsedir}/artifacts.xml
+%{_eclipsedir}/p2
%{_javadir}/%{name}/core*
%{_javadir}/%{name}/equinox*
@@ -1101,12 +1041,17 @@ fi
%{_datadir}/java/eclipse-testing
%files equinox-osgi -f .mfiles-equinox-osgi
-%{_libdir}/eclipse/plugins/org.eclipse.osgi_*
-%{_libdir}/eclipse/plugins/org.eclipse.osgi.services_*
-%{_libdir}/eclipse/plugins/org.eclipse.osgi.util_*
-%{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_*
+%{_eclipsedir}/plugins/org.eclipse.osgi_*
+%{_eclipsedir}/plugins/org.eclipse.osgi.compatibility.state_*
+%{_eclipsedir}/plugins/org.eclipse.osgi.services_*
+%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Tue Apr 04 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.7.0-0.1
+- Update to Oxygen I-build
+- Don't build unsupported GTK2 backend for SWT
+- Move installation to a multilib agnostic location /usr/lib
+
* Mon Apr 03 2017 Mat Booth <mat.booth(a)redhat.com> - 1:4.6.3-3
- Build missing remote ant support jar
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 04888d8..b89e69d 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=S4_6_3_RC4
+TAG=I20170404-0245
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
6 years, 9 months
Architecture specific change in rpms/cryptlib.git
by githook-noreply@fedoraproject.org
The package rpms/cryptlib.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cryptlib.git/commit/?id=9a9b9d15a....
Change:
+ExclusiveArch: x86_64 %{ix86} aarch64 ppc64
Thanks.
Full change:
============
commit aefdddb79eede043403f06753637f080a7eb5cc0
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 11:17:41 2017 +0200
add arches aarch64 and ppc64
diff --git a/cryptlib.spec b/cryptlib.spec
index d70e0f5..2142918 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -326,9 +326,6 @@ tar xpzf %{SOURCE4}
%changelog
-* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 3.4.3.1-2
-- Perl 5.26 rebuild
-
* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-2
- including arches aarch64 and ppc64
commit 259b22da5ee26183f795293a96214255bbeb88ab
Merge: 9a9b9d1 74ec908
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 11:16:07 2017 +0200
Merge branch 'master' of ssh://pkgs.fedoraproject.org/cryptlib
diff --cc cryptlib.spec
index 2142918,a580d17..d70e0f5
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@@ -326,10 -326,10 +326,13 @@@ tar xpzf %{SOURCE4
%changelog
+ * Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 3.4.3.1-2
+ - Perl 5.26 rebuild
+
+* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-2
+- including arches aarch64 and ppc64
+
* Sat Feb 11 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-1
- update to version 3.4.3.1
commit 9a9b9d15aa0b535ea158136b20b108ac53849476
Author: Ralf Senderek <ralph(a)lap.senderek.ie>
Date: Wed Jul 5 11:14:26 2017 +0200
add arches aarch64 and ppc64
diff --git a/cryptlib.spec b/cryptlib.spec
index c1575f9..2142918 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -6,7 +6,7 @@
Name: cryptlib
Version: 3.4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Security library and toolkit for encryption and authentication services
Group: System Environment/Libraries
@@ -27,7 +27,7 @@ Patch1: ccflagspatch
Patch2: javapatch
Patch3: nativepatch
-ExclusiveArch: x86_64 %{ix86} %{arm}
+ExclusiveArch: x86_64 %{ix86} aarch64 ppc64
BuildRequires: gcc
BuildRequires: libbsd-devel
@@ -327,6 +327,9 @@ tar xpzf %{SOURCE4}
%changelog
+* Wed Jul 05 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-2
+- including arches aarch64 and ppc64
+
* Sat Feb 11 2017 Senderek Web Security <innovation(a)senderek.ie> - 3.4.3.1-1
- update to version 3.4.3.1
diff --git a/sources b/sources
index 0e8eb75..06fd33f 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4
-SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9
-SHA512 (cryptlib-perlfiles.tar.gz) = b975d34acfd1d99a224bbd5536483e5489feac8801a567740ec668bcef9a1eff67fddbdad53f61b2ff48bd43396e92f070ebf4de622f3edeb70428f4aaae2ff6
-SHA512 (cryptlib-tests.tar.gz) = 83bc6061f0b76e5e46100a21965b8362ab1a2c1c4fcb8bcd7b87971f9f4fd59861685b47d72394f40295076f2b2d7993223c535ed21c8ea352551b65f71e1801
-SHA512 (cryptlib.spec) = 8e604f1824d1a82817c2c6b4d78d57b351de0e3256e7c1ed562168e41ccec6b66da7552aabe2c0acad9daab59a64eb9fc5d28a9aad1914b6d536edef2de2679d
-SHA512 (nativepatch) = bd57d1099c9650c0ec4848485308ff01c55f2e3663780fd12648507e627dbe6ca5ee6ca078d2364494a679aff17da59429fa846580a539ce3f6d5de3ebece966
+SHA512 (cryptlib.spec) = 948a61b3184fde1373e22e04e4fc80f6736afbf7055f6703ca882ccdb21caaa6cd1a0e066b901f948abf1ff80dff7d5177743271ae500aadf29f153130fba54e
6 years, 9 months