Architecture specific change in rpms/opencv.git
by githook-noreply@fedoraproject.org
The package rpms/opencv.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/opencv.git/commit/?id=07f89def731....
Change:
+%ifarch %{ix86} %{arm}
Thanks.
Full change:
============
commit 07f89def7317eed8ebc522e5b2185f10b1a93249
Author: Srgio M. Basto <sergio(a)serjux.com>
Date: Mon Dec 3 17:10:52 2018 +0000
Add the correct and upstreamed fix for support_YV12_too, pull request 13351
which is merged
diff --git a/c26c43c69c654344d2e2fb7b2d21121ca89224e6.patch b/c26c43c69c654344d2e2fb7b2d21121ca89224e6.patch
new file mode 100644
index 0000000..13b28b9
--- /dev/null
+++ b/c26c43c69c654344d2e2fb7b2d21121ca89224e6.patch
@@ -0,0 +1,35 @@
+From c26c43c69c654344d2e2fb7b2d21121ca89224e6 Mon Sep 17 00:00:00 2001
+From: Maksim Shabunin <maksim.shabunin(a)gmail.com>
+Date: Mon, 3 Dec 2018 17:16:09 +0300
+Subject: [PATCH] Fixed compilation with VA-interop on 32-bit platforms
+
+---
+ modules/core/src/va_intel.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/modules/core/src/va_intel.cpp b/modules/core/src/va_intel.cpp
+index ac74f0c5337..c571b90b5fe 100644
+--- a/modules/core/src/va_intel.cpp
++++ b/modules/core/src/va_intel.cpp
+@@ -340,8 +340,8 @@ static void copy_convert_yv12_to_bgr(const VAImage& image, const unsigned char*
+ 1.5959997177f
+ };
+
+- CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image format");
+- CV_CheckEQ(image.num_planes, 3, "");
++ CV_CheckEQ((size_t)image.format.fourcc, (size_t)VA_FOURCC_YV12, "Unexpected image format");
++ CV_CheckEQ((size_t)image.num_planes, (size_t)3, "");
+
+ const size_t srcOffsetY = image.offsets[0];
+ const size_t srcOffsetV = image.offsets[1];
+@@ -417,8 +417,8 @@ static void copy_convert_bgr_to_yv12(const VAImage& image, const Mat& bgr, unsig
+ -0.2909994125f, 0.438999176f, -0.3679990768f, -0.0709991455f
+ };
+
+- CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image format");
+- CV_CheckEQ(image.num_planes, 3, "");
++ CV_CheckEQ((size_t)image.format.fourcc, (size_t)VA_FOURCC_YV12, "Unexpected image format");
++ CV_CheckEQ((size_t)image.num_planes, (size_t)3, "");
+
+ const size_t dstOffsetY = image.offsets[0];
+ const size_t dstOffsetV = image.offsets[1];
diff --git a/fix_support_YV12_too.patch b/fix_support_YV12_too.patch
deleted file mode 100644
index 48e8e1c..0000000
--- a/fix_support_YV12_too.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./modules/core/src/va_intel.cpp.orig 2018-12-02 02:08:43.105140530 +0000
-+++ ./modules/core/src/va_intel.cpp 2018-12-02 02:44:51.917011656 +0000
-@@ -340,8 +340,8 @@ static void copy_convert_yv12_to_bgr(con
- 1.5959997177f
- };
-
-- CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image format");
-- CV_CheckEQ(image.num_planes, 3, "");
-+ //CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image format");
-+ //CV_CheckEQ(image.num_planes, 3, "");
-
- const size_t srcOffsetY = image.offsets[0];
- const size_t srcOffsetV = image.offsets[1];
-@@ -417,8 +417,8 @@ static void copy_convert_bgr_to_yv12(con
- -0.2909994125f, 0.438999176f, -0.3679990768f, -0.0709991455f
- };
-
-- CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image format");
-- CV_CheckEQ(image.num_planes, 3, "");
-+ //CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image format");
-+ //CV_CheckEQ(image.num_planes, 3, "");
-
- const size_t dstOffsetY = image.offsets[0];
- const size_t dstOffsetV = image.offsets[1];
diff --git a/opencv.spec b/opencv.spec
index 7838f15..f9567c4 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -52,7 +52,7 @@
Name: opencv
Version: 3.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Collection of algorithms for computer vision
# This is normal three clause BSD.
License: BSD
@@ -67,7 +67,7 @@ Source1: %{name}_contrib-clean-%{version}.tar.gz
# fix/simplify cmake config install location (upstreamable)
# https://bugzilla.redhat.com/1031312
Patch1: opencv-3.4.1-cmake_paths.patch
-Patch10: fix_support_YV12_too.patch
+Patch10: https://github.com/opencv/opencv/pull/13351/commits/c26c43c69c654344d2e2f...
Patch11: https://github.com/opencv/opencv_contrib/pull/1905/commits/c4419e4e65a8d9...
Patch12: https://github.com/opencv/opencv/pull/13254/commits/ad35b79e3f98b4ce30481...
@@ -234,20 +234,18 @@ to provide decent performance and stability.
%prep
%setup -q -a1
-# we don't use pre-built contribs
+# we don't use pre-built contribs except quirc
mv 3rdparty/quirc/ .
rm -r 3rdparty/
mkdir 3rdparty/
mv quirc/ 3rdparty/
%patch1 -p1 -b .cmake_paths
-%ifarch %{ix86} %{arm}
%patch10 -p1 -b .fix_support_YV12_too
+%ifarch %{ix86} %{arm}
%endif
pushd %{name}_contrib-%{version}
-# missing dependecies for dnn_modern module in Fedora (tiny-dnn)
-#rm -r modules/dnn_modern/
%patch11 -p1 -b .cvv_repair_build
popd
%patch12 -p1 -b .fix_install_of_python_bindings
@@ -421,6 +419,10 @@ popd
%{_libdir}/libopencv_xphoto.so.%{abiver}*
%changelog
+* Mon Dec 03 2018 Srgio Basto <sergio(a)serjux.com> - 3.4.4-2
+- Add the correct and upstreamed fix for support_YV12_too, pull request 13351
+ which is merged
+
* Sat Dec 01 2018 Srgio Basto <sergio(a)serjux.com> - 3.4.4-1
- Update to 3.4.4
5 years, 5 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=c242877b76....
Change:
-%ifarch ppc64 ppc64p7
Thanks.
Full change:
============
commit c242877b76e5e2703e87b6b912d141aa52348fda
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Mon Dec 3 16:06:07 2018 +0000
Update to latest I-build
Enable bootstrap mode
diff --git a/eclipse-adjust-droplets.patch b/eclipse-adjust-droplets.patch
index 0f44398..c751924 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
-@@ -147,7 +147,20 @@ public class EngineActivator implements BundleActivator {
+@@ -150,7 +150,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
-@@ -155,7 +155,20 @@ public class SimpleConfiguratorUtils {
+@@ -160,7 +160,20 @@ public class SimpleConfiguratorUtils {
}
continue;
}
diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch
index 4cdc915..6e2145d 100644
--- a/eclipse-debug-symbols.patch
+++ b/eclipse-debug-symbols.patch
@@ -1,6 +1,6 @@
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2018-08-19 12:37:52.764590467 +0100
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2018-08-19 12:38:15.032503913 +0100
-@@ -75,7 +75,8 @@
+@@ -74,7 +74,8 @@
MAKE_TYPE=make
@@ -12,7 +12,7 @@
if [ "${OS}" = "" ]; then
--- 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
-@@ -94,7 +94,7 @@
+@@ -92,7 +92,7 @@
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
-DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
diff --git a/eclipse-disable-droplets-in-dropins.patch b/eclipse-disable-droplets-in-dropins.patch
index 72336e1..b45995e 100644
--- a/eclipse-disable-droplets-in-dropins.patch
+++ b/eclipse-disable-droplets-in-dropins.patch
@@ -17,7 +17,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/o
index 802ee1b..74023fe 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
-@@ -168,11 +168,24 @@ public class PlatformXmlListener extends DirectoryChangeListener {
+@@ -171,11 +171,24 @@ public class PlatformXmlListener extends DirectoryChangeListener {
* Ensure that we have a repository for each site in the given configuration.
*/
protected void synchronizeConfiguration(Configuration config) {
diff --git a/eclipse-disable-uses-constraints.patch b/eclipse-disable-uses-constraints.patch
index 6d59127..5a56e61 100644
--- a/eclipse-disable-uses-constraints.patch
+++ b/eclipse-disable-uses-constraints.patch
@@ -12,7 +12,7 @@ diff --git rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/fe
index ded683f..7216865 100755
--- rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
+++ rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
-@@ -1230,7 +1230,9 @@ public class ResolverImpl implements Resolver
+@@ -1231,7 +1231,9 @@ public class ResolverImpl implements Resolver
{
public void run()
{
diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch
index 817ade0..95ec74e 100644
--- a/eclipse-feature-plugins-to-category-ius.patch
+++ b/eclipse-feature-plugins-to-category-ius.patch
@@ -313,30 +313,31 @@
</feature>
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2018-08-19 13:57:13.249904259 +0100
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2018-08-19 14:03:19.527742984 +0100
-@@ -22,6 +22,22 @@
+@@ -22,6 +22,23 @@
<requires>
<import feature="org.eclipse.emf.common" version="2.7.0" match="compatible"/>
<import feature="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>
-+ <import plugin="org.apache.batik.constants" />
+ <import plugin="org.apache.batik.css" />
-+ <import plugin="org.apache.batik.i18n" />
-+ <import plugin="org.apache.batik.util" />
-+ <import plugin="org.apache.xmlgraphics" />
+ <import plugin="org.w3c.css.sac" />
++ <import plugin="org.apache.batik.util" />
+ <import plugin="org.w3c.dom.svg" />
+ <import plugin="javax.inject" />
++ <import plugin="javax.annotation-api" />
++ <import plugin="org.apache.batik.i18n" />
++ <import plugin="org.apache.batik.constants" />
++ <import plugin="org.apache.xmlgraphics" />
++ <import plugin="org.apache.commons.io" />
++ <import plugin="org.apache.commons.logging" />
+ <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.apache.commons.io" />
+ <import plugin="org.apache.commons.jxpath" />
-+ <import plugin="org.apache.commons.logging" />
</requires>
<plugin
-@@ -95,62 +111,6 @@
+@@ -95,62 +112,6 @@
unpack="false"/>
<plugin
@@ -399,10 +400,17 @@
id="org.eclipse.e4.core.di"
download-size="0"
install-size="0"
-@@ -172,34 +132,6 @@
+@@ -165,41 +126,6 @@
unpack="false"/>
<plugin
+- id="org.apache.batik.i18n"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
- id="org.apache.batik.constants"
- download-size="0"
- install-size="0"
@@ -434,7 +442,7 @@
id="org.eclipse.e4.core.di.extensions"
download-size="0"
install-size="0"
-@@ -245,13 +177,6 @@
+@@ -245,13 +171,6 @@
unpack="false"/>
<plugin
@@ -445,10 +453,10 @@
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.ds"
+ id="org.eclipse.equinox.event"
download-size="0"
install-size="0"
-@@ -343,13 +268,6 @@
+@@ -336,13 +255,6 @@
unpack="false"/>
<plugin
@@ -462,7 +470,7 @@
id="org.eclipse.equinox.preferences"
download-size="0"
install-size="0"
-@@ -624,27 +542,6 @@
+@@ -596,27 +508,6 @@
unpack="false"/>
<plugin
@@ -490,7 +498,7 @@
id="org.eclipse.equinox.console"
download-size="0"
install-size="0"
-@@ -670,13 +567,6 @@
+@@ -642,13 +533,6 @@
download-size="0"
install-size="0"
version="0.0.0"
@@ -538,26 +546,189 @@
<versionRange>0.0.0</versionRange>
</requirement>
<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
-@@ -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",
-+Import-Package: javax.inject;version="1.0.0",
- org.osgi.framework;version="1.5.0",
- org.osgi.service.event;version="1.3.1"
- Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
---- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF.orig 2017-02-15 10:00:56.352770853 +0000
-+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF 2017-02-15 10:01:06.757646050 +0000
-@@ -14,7 +14,6 @@
- org.eclipse.e4.core.di;bundle-version="0.9.0"
- Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
- Bundle-ActivationPolicy: lazy
--Import-Package: javax.annotation,
-- javax.inject;version="1.0.0"
-+Import-Package: javax.inject;version="1.0.0"
- Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
- Automatic-Module-Name: org.eclipse.e4.tools.services
+--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2018-11-29 17:25:22.652275197 +0000
++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2018-11-29 17:31:00.129228645 +0000
+@@ -19,6 +19,17 @@
+ %license
+ </license>
+
++ <requires>
++ <import plugin="org.apache.commons.fileupload" />
++ <import plugin="org.apache.commons.io" />
++ <import plugin="org.hamcrest.core" />
++ <import plugin="org.hamcrest.integration" />
++ <import plugin="org.hamcrest.library" />
++ <import plugin="org.mockito.mockito-core" />
++ <import plugin="org.objenesis" />
++ <import plugin="net.sf.cglib.core" />
++ </requires>
++
+ <includes
+ id="org.eclipse.test"
+ version="0.0.0"/>
+@@ -422,20 +433,6 @@
+ version="0.0.0"/>
+
+ <plugin
+- id="org.apache.commons.fileupload"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.commons.io"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.equinox.p2.installer"
+ download-size="0"
+ install-size="0"
+@@ -485,41 +482,6 @@
+ version="0.0.0"/>
+
+ <plugin
+- id="org.hamcrest.core"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.hamcrest.integration"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.hamcrest.library"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.mockito"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.objenesis"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.ui.tests.pluginchecks"
+ download-size="0"
+ install-size="0"
+--- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig 2018-11-30 01:09:49.920232553 +0000
++++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml 2018-11-30 01:12:08.186867812 +0000
+@@ -19,6 +19,15 @@
+ %license
+ </license>
+
++ <requires>
++ <import plugin="org.junit" />
++ <import plugin="org.easymock" />
++ <import plugin="org.hamcrest.core" />
++ <import plugin="org.hamcrest.library" />
++ <import plugin="org.mockito.mockito-core" />
++ <import plugin="net.sf.cglib.core" />
++ </requires>
++
+ <plugin
+ id="org.eclipse.ant.optional.junit"
+ download-size="0"
+@@ -55,57 +64,9 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.junit"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+- id="org.easymock"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.hamcrest.core"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.mockito"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="net.bytebuddy.byte-buddy"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="net.bytebuddy.byte-buddy-agent"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.core.tests.harness"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+- <plugin
+- id="org.hamcrest.library"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+ </feature>
+--- ./eclipse.platform.ua/org.eclipse.tips.feature/feature.xml.orig 2018-12-03 15:28:24.822448273 +0000
++++ ./eclipse.platform.ua/org.eclipse.tips.feature/feature.xml 2018-12-03 15:29:45.204209427 +0000
+@@ -32,6 +32,10 @@
+ %license
+ </license>
+
++ <requires>
++ <import plugin="com.google.gson" />
++ </requires>
++
+ <plugin
+ id="org.eclipse.tips.ui"
+ download-size="0"
+@@ -58,13 +62,6 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="com.google.gson"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+ unpack="false"/>
+
+ </feature>
diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch
index e96c840..c35b86d 100644
--- a/eclipse-fix-dropins.patch
+++ b/eclipse-fix-dropins.patch
@@ -1,6 +1,6 @@
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java.orig 2014-03-24 10:49:00.000000000 +0000
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java 2014-03-24 15:39:32.122246214 +0000
-@@ -39,6 +39,7 @@
+@@ -44,6 +44,7 @@
public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
@@ -8,7 +8,7 @@
private static final String SIMPLE_PROFILE_REGISTRY_INTERNAL = "_simpleProfileRegistry_internal_"; //$NON-NLS-1$
private static final String PROFILE_REGISTRY = "profile registry"; //$NON-NLS-1$
private static final String PROFILE_PROPERTIES_FILE = "state.properties"; //$NON-NLS-1$
-@@ -266,6 +267,14 @@
+@@ -279,6 +280,14 @@
//fragments support - remeber the property
internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getExtTimeStamp(), getExtTimeStamp());
agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp()));
@@ -23,7 +23,7 @@
} else {
//This is the first time we create the shared profile. Tag it as such and also remember the timestamp of the base
internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL);
-@@ -299,6 +308,13 @@
+@@ -312,6 +321,13 @@
if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null)
return false;
@@ -39,7 +39,7 @@
if (baseTimestamp == null) {
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
-@@ -570,6 +570,7 @@
+@@ -563,6 +563,7 @@
// get all IUs from all our repos
IQueryResult<IInstallableUnit> allIUs = getAllIUsFromRepos();
@@ -47,7 +47,7 @@
for (Iterator<IInstallableUnit> iter = allIUs.iterator(); iter.hasNext();) {
final IInstallableUnit iu = iter.next();
IInstallableUnit existing = profileIUs.get(iu);
-@@ -583,6 +584,7 @@
+@@ -576,6 +577,7 @@
// (and more expensive) way to find this out is to do an IU profile property query.
if (two == null) {
// the IU is already installed so don't mark it as a dropin now - see bug 404619.
@@ -55,7 +55,7 @@
iter.remove();
continue;
}
-@@ -625,7 +627,7 @@
+@@ -618,7 +620,7 @@
}
// if the IU from the profile is in the "all available" list, then it is already added
// otherwise if it isn't in the repo then we have to remove it from the profile.
@@ -64,7 +64,7 @@
toRemove.add(iu);
}
-@@ -799,8 +801,8 @@
+@@ -792,8 +794,8 @@
IStatus installerPlanStatus = engine.perform(plan.getInstallerPlan(), phaseSet, monitor);
if (!installerPlanStatus.isOK())
return installerPlanStatus;
@@ -77,7 +77,7 @@
}
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig 2018-04-25 20:31:57.931223008 +0100
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2018-04-25 20:32:11.069144336 +0100
-@@ -148,7 +148,7 @@
+@@ -151,7 +151,7 @@
@Override
public boolean performCancel() {
diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
index b484ea6..e979876 100644
--- a/eclipse-mockito.patch
+++ b/eclipse-mockito.patch
@@ -1,54 +1,40 @@
--- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:42:36.169928566 +0000
+++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:56:27.970146198 +0000
-@@ -42,8 +42,9 @@
- org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
- org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0",
+@@ -44,7 +44,7 @@
org.eclipse.osgi.services;bundle-version="3.3.100",
-- org.hamcrest;bundle-version="1.1.0",
-- org.mockito;bundle-version="1.8.4"
-+ org.hamcrest.core,
-+ org.hamcrest.library,
+ org.hamcrest.core;bundle-version="1.3.0",
+ org.hamcrest.library;bundle-version="1.3.0",
+- org.mockito;bundle-version="2.13.0"
+ org.mockito.mockito-core
+ Import-Package: javax.annotation
Eclipse-AutoStart: true
Export-Package: org.eclipse.ui.tests.api,
- 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 @@
+@@ -31,8 +31,9 @@
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",
-- org.hamcrest;bundle-version="1.1.0",
-- org.mockito;bundle-version="1.8.4",
-+ org.hamcrest.core,
++ org.hamcrest.core;bundle-version="1.3.0",
+ org.hamcrest.library;bundle-version="1.3.0",
+- org.mockito;bundle-version="2.13.0",
+ org.mockito.mockito-core,
org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
org.eclipse.test.performance;bundle-version="3.13.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF.orig 2014-04-22 14:31:35.155774270 +0100
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF 2014-04-22 14:33:47.599498477 +0100
-@@ -10,8 +10,8 @@
+@@ -10,8 +10,9 @@
org.w3c.css.sac,
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
org.eclipse.ui;bundle-version="3.106.0",
-- org.hamcrest;bundle-version="1.1.0",
-- org.mockito;bundle-version="1.8.4",
-+ org.hamcrest.core,
++ org.hamcrest.core;bundle-version="1.3.0",
+ org.hamcrest.library;bundle-version="1.3.0",
+- org.mockito;bundle-version="2.13.0",
+ org.mockito.mockito-core,
org.eclipse.equinox.preferences;bundle-version="3.5.200",
org.eclipse.ui.forms,
org.eclipse.ui.views.properties.tabbed
---- 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"
--- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig 2018-08-20 12:54:25.245305107 +0100
+++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF 2018-08-20 12:54:37.952261537 +0100
@@ -33,6 +33,7 @@
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 54451f8..449b9d4 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -70,10 +70,10 @@
</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
-@@ -68,6 +68,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"/>
+@@ -61,6 +61,8 @@
+ <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
+ <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>
+ <plugin id="org.eclipse.core.resources.win32.x86_64"/>
+ <plugin id="com.jcraft.jsch"/>
+ <plugin id="org.apache.ant"/>
</excludes>
@@ -81,13 +81,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
-@@ -44,6 +44,22 @@
+@@ -42,6 +42,23 @@
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"/>
<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.equinox.launcher.gtk.linux.x86" />
+ <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-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch
deleted file mode 100644
index 801e088..0000000
--- a/eclipse-remove-jgit-provider.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- eclipse-platform-parent/pom.xml.orig 2014-11-28 14:54:50.000000000 +0000
-+++ eclipse-platform-parent/pom.xml 2014-11-28 15:32:51.700154985 +0000
-@@ -491,7 +491,7 @@
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- <dependencies>
-- <dependency>
-+ <!-- dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-buildtimestamp-jgit</artifactId>
- <version>${tycho-extras.version}</version>
-@@ -500,19 +500,19 @@
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-sourceref-jgit</artifactId>
- <version>${tycho-extras.version}</version>
-- </dependency>
-+ </dependency-->
- </dependencies>
- <configuration>
- <strictBinIncludes>false</strictBinIncludes>
- <format>${qualifier.format}</format>
-- <timestampProvider>jgit</timestampProvider>
-+ <!--timestampProvider>jgit</timestampProvider-->
- <jgit.ignore>
- pom.xml
- </jgit.ignore>
- <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
-- <sourceReferences>
-+ <!--sourceReferences>
- <generate>true</generate>
-- </sourceReferences>
-+ </sourceReferences-->
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 9b3ddb4..ee9188d 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -2,12 +2,10 @@ 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
-@@ -418,6 +418,36 @@
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-+
-+ <plugin
+@@ -393,6 +393,46 @@
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
+ os="linux"
+ ws="gtk"
@@ -36,10 +34,22 @@ index 7e1f520..734dd10 100644
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
-
- <plugin
- id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -496,6 +526,39 @@
++
++ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.x86"
++ os="linux"
++ ws="gtk"
++ arch="x86"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
++
++ <plugin
+ id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
+ os="macosx"
+ ws="cocoa"
+@@ -480,6 +520,50 @@
download-size="0"
install-size="0"
version="0.0.0"
@@ -76,6 +86,17 @@ index 7e1f520..734dd10 100644
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.x86"
++ os="linux"
++ ws="gtk"
++ arch="x86"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -87,15 +108,15 @@ index 7e1f520..734dd10 100644
<include name="cocoa/macosx/x86_64/**/*"/>
+ <include name="gtk/linux/arm/**/*"/>
+ <include name="gtk/linux/aarch64/**/*"/>
-+ <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/**/*"/>
<include name="gtk/linux/x86_64/**/*"/>
- <include name="win32/win32/x86/**/*"/>
+ <include name="win32/win32/x86_64/**/*"/>
+ </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
-@@ -37,3 +37,15 @@
+@@ -32,3 +32,15 @@
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
@@ -106,11 +127,11 @@ index 7e1f520..734dd10 100644
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
+root.linux.gtk.aarch64.permissions.755=launcher
+
-+root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
-+root.linux.gtk.ppc64.permissions.755=launcher
-+
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
+root.linux.gtk.s390x.permissions.755=launcher
++
++root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
++root.linux.gtk.x86.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
@@ -54,7 +54,11 @@
@@ -119,38 +140,38 @@ index 7e1f520..734dd10 100644
<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.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</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
- <module>bundles/org.eclipse.swt.win32.win32.x86</module>
+ <module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
+ </modules>
--- 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
-@@ -34,3 +34,23 @@
- requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
- requires.7.range = [$version$,$version$]
- requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
+@@ -24,3 +24,23 @@
+ requires.5.name = org.eclipse.swt.gtk.linux.ppc64le
+ requires.5.range = [$version$,$version$]
+ requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
++
++requires.6.namespace = org.eclipse.equinox.p2.iu
++requires.6.name = org.eclipse.swt.gtk.linux.arm
++requires.6.range = [$version$,$version$]
++requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
++
++requires.7.namespace = org.eclipse.equinox.p2.iu
++requires.7.name = org.eclipse.swt.gtk.linux.aarch64
++requires.7.range = [$version$,$version$]
++requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
+
+requires.8.namespace = org.eclipse.equinox.p2.iu
-+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
++requires.8.name = org.eclipse.swt.gtk.linux.s390x
+requires.8.range = [$version$,$version$]
-+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
++requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
+
+requires.9.namespace = org.eclipse.equinox.p2.iu
-+requires.9.name = org.eclipse.swt.gtk.linux.arm
++requires.9.name = org.eclipse.swt.gtk.linux.x86
+requires.9.range = [$version$,$version$]
-+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.10.namespace = org.eclipse.equinox.p2.iu
-+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
-+requires.10.range = [$version$,$version$]
-+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.11.namespace = org.eclipse.equinox.p2.iu
-+requires.11.name = org.eclipse.swt.gtk.linux.s390x
-+requires.11.range = [$version$,$version$]
-+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
++requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(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
@@ -109,7 +109,7 @@
@@ -169,27 +190,27 @@ index 7e1f520..734dd10 100644
</modules>
</profile>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.ppc64</id>
++ <id>build-native-launchers-gtk.linux.s390x</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.ppc64</value>
++ <value>gtk.linux.s390x</value>
+ </property>
+ </activation>
+ <modules>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
+ </modules>
+ </profile>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.s390x</id>
++ <id>build-native-launchers-gtk.linux.x86</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.s390x</value>
++ <value>gtk.linux.x86</value>
+ </property>
+ </activation>
+ <modules>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module>
+ </modules>
+ </profile>
</profiles>
diff --git a/eclipse-support-symlink-bundles.patch b/eclipse-support-symlink-bundles.patch
index 63293fb..17f2e56 100644
--- a/eclipse-support-symlink-bundles.patch
+++ b/eclipse-support-symlink-bundles.patch
@@ -29,9 +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
-@@ -15,8 +15,12 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
- import java.net.*;
+@@ -20,8 +20,12 @@
import java.nio.file.Files;
+ import java.nio.file.attribute.FileTime;
import java.util.*;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
@@ -43,7 +43,7 @@ index ab69b88..d6bf121 100644
public class SimpleConfiguratorUtils {
-@@ -277,6 +281,16 @@ public class SimpleConfiguratorUtils {
+@@ -282,6 +286,16 @@
String symbolicName = tok.nextToken().trim();
String version = tok.nextToken().trim();
URI location = parseLocation(tok.nextToken().trim());
@@ -60,9 +60,9 @@ index ab69b88..d6bf121 100644
int startLevel = Integer.parseInt(tok.nextToken().trim());
boolean markedAsStarted = Boolean.parseBoolean(tok.nextToken());
BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted);
-@@ -400,4 +414,93 @@ public class SimpleConfiguratorUtils {
+@@ -420,4 +434,93 @@
}
- return regularTimestamp;
+ return lastModified;
}
+
+ private static Dictionary<String, String> getOSGiManifest(URI location) {
@@ -154,6 +154,3 @@ index ab69b88..d6bf121 100644
+ return result;
+ }
}
---
-2.5.0
-
diff --git a/eclipse-swt-disable-gtk2.patch b/eclipse-swt-disable-gtk2.patch
deleted file mode 100644
index 28911d6..0000000
--- a/eclipse-swt-disable-gtk2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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" depends="get_version" 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" depends="get_version" if="machine_gtk3">
diff --git a/eclipse.spec b/eclipse.spec
index 2271d8c..5bcfe91 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,12 +1,12 @@
# 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 44643cbda3dfd6f00fbf1b346dae7068df2a9ef9
-%global eclipse_tag I20180906-0745
+%global eclipse_tag I20181203-0600
%global _jetty_version 9.4.11
%global _lucene_version 7.1.0
@@ -17,9 +17,6 @@ Epoch: 1
%ifarch %{arm}
%global eclipse_arch arm
%endif
-%ifarch ppc64 ppc64p7
- %global eclipse_arch ppc64
-%endif
%ifarch s390x x86_64 aarch64 ppc64le
%global eclipse_arch %{_arch}
%endif
@@ -39,8 +36,8 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
-Version: 4.9.0
-Release: 2%{?dist}
+Version: 4.10.0
+Release: 0.1%{?dist}
License: EPL-2.0
URL: http://www.eclipse.org/
@@ -61,10 +58,7 @@ Patch1: eclipse-p2-pick-up-renamed-jars.patch
# Patch for this was contributed. Unlikely to be released.
Patch2: eclipse-ignore-version-when-calculating-home.patch
-# CBI uses timestamps generated from the git commits. We don't have the repo,
-# just source, and we don't want additional dependencies.
-Patch3: eclipse-remove-jgit-provider.patch
-
+# Add support for all arches supported by Fedora
Patch4: eclipse-secondary-arches.patch
Patch5: eclipse-debug-symbols.patch
@@ -88,7 +82,7 @@ Patch15: eclipse-support-symlink-bundles.patch
# javax.el -> javax.el-api
# javax.servlet -> javax.servlet-api
# org.apache.jasper.glassfish -> org.glassfish.web.javax.servlet.jsp
-# javax.annotation -> removed
+# javax.annotation -> javax.annotation-api
# org.w3c.dom.smil -> removed
Patch16: eclipse-feature-plugins-to-category-ius.patch
@@ -99,9 +93,6 @@ Patch20: eclipse-fix-tests.patch
Patch21: eclipse-adjust-droplets.patch
Patch22: eclipse-pde-tp-support-droplets.patch
-# Only build gtk3 backend for SWT
-Patch23: eclipse-swt-disable-gtk2.patch
-
# Disable uses by default
Patch24: eclipse-disable-uses-constraints.patch
@@ -152,7 +143,7 @@ BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(webkit2gtk-4.0)
-BuildRequires: icu4j >= 1:62.1
+BuildRequires: icu4j >= 1:63.1
BuildRequires: ant >= 1.10.5
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 ant-xz ant-junit5
@@ -162,6 +153,7 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-jxpath
BuildRequires: apache-commons-fileupload
+BuildRequires: apache-sshd
BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.1.0
BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2
BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0
@@ -192,6 +184,7 @@ BuildRequires: atinject
BuildRequires: eclipse-ecf-core >= 3.14.1-2
BuildRequires: eclipse-emf-core >= 1:2.15.0-0.2
BuildRequires: eclipse-license2
+BuildRequires: glassfish-annotation-api
BuildRequires: glassfish-el-api >= 3.0.1
BuildRequires: glassfish-el >= 3.0.1
BuildRequires: glassfish-jsp-api >= 2.2.1-4
@@ -273,12 +266,13 @@ Requires: xml-commons-apis
Requires: atinject
Requires: eclipse-ecf-core >= 3.14.0-1
Requires: eclipse-emf-core >= 1:2.14.0-1
+Requires: glassfish-annotation-api
Requires: glassfish-el-api >= 3.0.1
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:62.1
+Requires: icu4j >= 1:63.1
Requires: %{name}-swt = %{epoch}:%{version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
Requires: httpcomponents-core
@@ -372,7 +366,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
%patch0
%patch1
%patch2
-%patch3
%patch4 -p1
%patch5
#%patch6
@@ -383,7 +376,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
%patch20
%patch21
%patch22
-%patch23
%patch24
%patch26
%patch27
@@ -394,10 +386,11 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
%patch29
%patch30 -p1
-# Use ecj when bootstrapping
-%if %{bootstrap}
-sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platform-parent/pom.xml
-%endif
+# Remove jgit deps because building from source tarball, not a git repo
+%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
+%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
+%pom_xpath_remove 'pom:configuration/pom:timestampProvider' eclipse-platform-parent
+%pom_xpath_remove 'pom:configuration/pom:sourceReferences' eclipse-platform-parent
# Resolving the target platform requires too many changes, so don't use it
%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent
@@ -417,6 +410,7 @@ sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platf
%pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.console.ssh.tests rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles
@@ -430,15 +424,17 @@ sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platf
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2
+%pom_disable_module bundles/org.eclipse.equinox.p2.tests.optimizers rt.equinox.p2
%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2
# Don't need annotations for obsolete JDKs
%pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core
-%pom_xpath_remove "plugin[@version='1.1.300.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
+%pom_xpath_remove "plugin[@version='1.1.400.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d' \
eclipse.jdt.core/org.eclipse.jdt.core.tests.{model,builder,compiler}/META-INF/MANIFEST.MF \
eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF \
eclipse.jdt.ui/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF
+sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
# Disable examples
%pom_disable_module bundles/org.eclipse.sdk.examples eclipse.platform.releng
@@ -450,10 +446,13 @@ sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d'
%pom_disable_module bundles/org.eclipse.equinox.servletbridge rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles
+# Missing dep on reddeer
+%pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui
+
# This part generates secondary fragments using primary fragments
for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do
utils/ensure_arch.sh "$dir" x86 arm
- utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64
+ utils/ensure_arch.sh "$dir" x86_64 aarch64
done
# Remove platform-specific stuff that we don't care about to reduce build time
@@ -479,8 +478,11 @@ for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.laun
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
+ module=$(grep ">bundles/$b<" rt.equinox.bundles/pom.xml || :)
+ if [ -n "$module" ] ; then
+ %pom_disable_module bundles/$b rt.equinox.bundles
+ %pom_xpath_remove -f "plugin[@id='$b']" rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
+ fi
done
for b in `ls eclipse.platform.team/bundles/org.eclipse.core.net/fragments/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{eclipse_arch}$)'` ; do
%pom_disable_module bundles/org.eclipse.core.net/fragments/$b eclipse.platform.team
@@ -498,7 +500,6 @@ done
%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 \
@@ -507,7 +508,7 @@ 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
+ for arch in x86 x86_64 arm aarch64 ppc64le s390x ; do
if [ "$arch" != "%{eclipse_arch}" ] ; then
%pom_xpath_remove -f "plugin[@arch='$arch']" $f
fi
@@ -516,7 +517,7 @@ done
# Fix versions in secondary arch fragments
fix_files=$(grep -lr 3.107.100 eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*)
-sed -i -e "s/3.107.100/3.108.0/" $fix_files
+sed -i -e "s/3.107.100/3.109.0/" $fix_files
fix_files=$(grep -lr '1\.1\.[67]00' rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.*)
sed -i -e "s/1\.1\.[67]00/1.1.800/" $fix_files
sed -i -e "/Fragment-Host/s/\(bundle-version=\).*/\1\"1.0.0\"/" $fix_files
@@ -546,15 +547,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
-# 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
-
-# Use unbundled mockito
-%pom_xpath_remove "plugin[@id='org.mockito']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
-%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
@@ -571,10 +563,9 @@ 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 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 \
+for f in 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
+ eclipse.platform.team/bundles/org.eclipse.core.net.linux.*/META-INF/MANIFEST.MF ; do
echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
done
@@ -612,6 +603,11 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/
+# Temporary until mockito updated in Fedora
+grep -l -Z -r "org.mockito.ArgumentMatchers" eclipse.platform.ui/tests | xargs -0 sed -i -- 's/org.mockito.ArgumentMatchers/org.mockito.Matchers/'
+sed -i -e 's/populateDefinition(isNull(), isNull()/populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class)/' \
+ "eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java"
+
# This test doesn't build on 32bit
# See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=534174
rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java
@@ -664,7 +660,7 @@ mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded
# Qualifier generated from last modification time of source tarball
QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
-%mvn_build -j -f -- -DforceContextQualifier=$QUALIFIER \
+%mvn_build -j -f -- -e -DforceContextQualifier=$QUALIFIER \
%if %{bootstrap}
-P !api-generation,!build-docs \
%endif
@@ -1083,6 +1079,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Thu Nov 29 2018 Mat Booth <mat.booth(a)redhat.com> - 1:4.10.0-0.1
+- Update to latest I-build
+- Enable bootstrap mode
+
* Fri Sep 28 2018 Jeff Johnston <jjohnstn(a)redhat.com> - 1:4.9.0-2
- Add org.eclipse.equinox.executable for building RCP apps
diff --git a/sources b/sources
index 469688b..c28a3f3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (eclipse-platform-sources-I20180906-0745.tar.xz) = eed6fbb7d160713ba2c043e7b218a778fa493e1187fbaf6b0a36a231ab1a35d61ecc2793b179d911d6e34105534ab47cc2d0fabe54ac216b5371adab7606c6a5
+SHA512 (eclipse-platform-sources-I20181203-0600.tar.xz) = 3f2309a4094721fc6dfe643c86249e5d143fcf2c402b5871234bda60f330140f16d5062d86aa0c3125d43f7524aaeb9182711a0e6ced573a1efe3105c0dd03f8
SHA512 (org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz) = ef02f54deefd154265122fa0191c8d69bbb135e026171de147a7fb3af83bb26523ea866d19aa7c7cc184c8e05ad55e54846a909bea69bd1bc6cd57005d055ebf
5 years, 5 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=c242877b76....
Change:
-%ifarch ppc64 ppc64p7
Thanks.
Full change:
============
commit c242877b76e5e2703e87b6b912d141aa52348fda
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Mon Dec 3 16:06:07 2018 +0000
Update to latest I-build
Enable bootstrap mode
diff --git a/eclipse-adjust-droplets.patch b/eclipse-adjust-droplets.patch
index 0f44398..c751924 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
-@@ -147,7 +147,20 @@ public class EngineActivator implements BundleActivator {
+@@ -150,7 +150,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
-@@ -155,7 +155,20 @@ public class SimpleConfiguratorUtils {
+@@ -160,7 +160,20 @@ public class SimpleConfiguratorUtils {
}
continue;
}
diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch
index 4cdc915..6e2145d 100644
--- a/eclipse-debug-symbols.patch
+++ b/eclipse-debug-symbols.patch
@@ -1,6 +1,6 @@
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2018-08-19 12:37:52.764590467 +0100
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2018-08-19 12:38:15.032503913 +0100
-@@ -75,7 +75,8 @@
+@@ -74,7 +74,8 @@
MAKE_TYPE=make
@@ -12,7 +12,7 @@
if [ "${OS}" = "" ]; then
--- 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
-@@ -94,7 +94,7 @@
+@@ -92,7 +92,7 @@
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
-DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
diff --git a/eclipse-disable-droplets-in-dropins.patch b/eclipse-disable-droplets-in-dropins.patch
index 72336e1..b45995e 100644
--- a/eclipse-disable-droplets-in-dropins.patch
+++ b/eclipse-disable-droplets-in-dropins.patch
@@ -17,7 +17,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/o
index 802ee1b..74023fe 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
-@@ -168,11 +168,24 @@ public class PlatformXmlListener extends DirectoryChangeListener {
+@@ -171,11 +171,24 @@ public class PlatformXmlListener extends DirectoryChangeListener {
* Ensure that we have a repository for each site in the given configuration.
*/
protected void synchronizeConfiguration(Configuration config) {
diff --git a/eclipse-disable-uses-constraints.patch b/eclipse-disable-uses-constraints.patch
index 6d59127..5a56e61 100644
--- a/eclipse-disable-uses-constraints.patch
+++ b/eclipse-disable-uses-constraints.patch
@@ -12,7 +12,7 @@ diff --git rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/fe
index ded683f..7216865 100755
--- rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
+++ rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
-@@ -1230,7 +1230,9 @@ public class ResolverImpl implements Resolver
+@@ -1231,7 +1231,9 @@ public class ResolverImpl implements Resolver
{
public void run()
{
diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch
index 817ade0..95ec74e 100644
--- a/eclipse-feature-plugins-to-category-ius.patch
+++ b/eclipse-feature-plugins-to-category-ius.patch
@@ -313,30 +313,31 @@
</feature>
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2018-08-19 13:57:13.249904259 +0100
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2018-08-19 14:03:19.527742984 +0100
-@@ -22,6 +22,22 @@
+@@ -22,6 +22,23 @@
<requires>
<import feature="org.eclipse.emf.common" version="2.7.0" match="compatible"/>
<import feature="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>
-+ <import plugin="org.apache.batik.constants" />
+ <import plugin="org.apache.batik.css" />
-+ <import plugin="org.apache.batik.i18n" />
-+ <import plugin="org.apache.batik.util" />
-+ <import plugin="org.apache.xmlgraphics" />
+ <import plugin="org.w3c.css.sac" />
++ <import plugin="org.apache.batik.util" />
+ <import plugin="org.w3c.dom.svg" />
+ <import plugin="javax.inject" />
++ <import plugin="javax.annotation-api" />
++ <import plugin="org.apache.batik.i18n" />
++ <import plugin="org.apache.batik.constants" />
++ <import plugin="org.apache.xmlgraphics" />
++ <import plugin="org.apache.commons.io" />
++ <import plugin="org.apache.commons.logging" />
+ <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.apache.commons.io" />
+ <import plugin="org.apache.commons.jxpath" />
-+ <import plugin="org.apache.commons.logging" />
</requires>
<plugin
-@@ -95,62 +111,6 @@
+@@ -95,62 +112,6 @@
unpack="false"/>
<plugin
@@ -399,10 +400,17 @@
id="org.eclipse.e4.core.di"
download-size="0"
install-size="0"
-@@ -172,34 +132,6 @@
+@@ -165,41 +126,6 @@
unpack="false"/>
<plugin
+- id="org.apache.batik.i18n"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
- id="org.apache.batik.constants"
- download-size="0"
- install-size="0"
@@ -434,7 +442,7 @@
id="org.eclipse.e4.core.di.extensions"
download-size="0"
install-size="0"
-@@ -245,13 +177,6 @@
+@@ -245,13 +171,6 @@
unpack="false"/>
<plugin
@@ -445,10 +453,10 @@
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.ds"
+ id="org.eclipse.equinox.event"
download-size="0"
install-size="0"
-@@ -343,13 +268,6 @@
+@@ -336,13 +255,6 @@
unpack="false"/>
<plugin
@@ -462,7 +470,7 @@
id="org.eclipse.equinox.preferences"
download-size="0"
install-size="0"
-@@ -624,27 +542,6 @@
+@@ -596,27 +508,6 @@
unpack="false"/>
<plugin
@@ -490,7 +498,7 @@
id="org.eclipse.equinox.console"
download-size="0"
install-size="0"
-@@ -670,13 +567,6 @@
+@@ -642,13 +533,6 @@
download-size="0"
install-size="0"
version="0.0.0"
@@ -538,26 +546,189 @@
<versionRange>0.0.0</versionRange>
</requirement>
<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
-@@ -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",
-+Import-Package: javax.inject;version="1.0.0",
- org.osgi.framework;version="1.5.0",
- org.osgi.service.event;version="1.3.1"
- Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
---- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF.orig 2017-02-15 10:00:56.352770853 +0000
-+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF 2017-02-15 10:01:06.757646050 +0000
-@@ -14,7 +14,6 @@
- org.eclipse.e4.core.di;bundle-version="0.9.0"
- Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
- Bundle-ActivationPolicy: lazy
--Import-Package: javax.annotation,
-- javax.inject;version="1.0.0"
-+Import-Package: javax.inject;version="1.0.0"
- Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
- Automatic-Module-Name: org.eclipse.e4.tools.services
+--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2018-11-29 17:25:22.652275197 +0000
++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2018-11-29 17:31:00.129228645 +0000
+@@ -19,6 +19,17 @@
+ %license
+ </license>
+
++ <requires>
++ <import plugin="org.apache.commons.fileupload" />
++ <import plugin="org.apache.commons.io" />
++ <import plugin="org.hamcrest.core" />
++ <import plugin="org.hamcrest.integration" />
++ <import plugin="org.hamcrest.library" />
++ <import plugin="org.mockito.mockito-core" />
++ <import plugin="org.objenesis" />
++ <import plugin="net.sf.cglib.core" />
++ </requires>
++
+ <includes
+ id="org.eclipse.test"
+ version="0.0.0"/>
+@@ -422,20 +433,6 @@
+ version="0.0.0"/>
+
+ <plugin
+- id="org.apache.commons.fileupload"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.commons.io"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.equinox.p2.installer"
+ download-size="0"
+ install-size="0"
+@@ -485,41 +482,6 @@
+ version="0.0.0"/>
+
+ <plugin
+- id="org.hamcrest.core"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.hamcrest.integration"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.hamcrest.library"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.mockito"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.objenesis"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.ui.tests.pluginchecks"
+ download-size="0"
+ install-size="0"
+--- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig 2018-11-30 01:09:49.920232553 +0000
++++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml 2018-11-30 01:12:08.186867812 +0000
+@@ -19,6 +19,15 @@
+ %license
+ </license>
+
++ <requires>
++ <import plugin="org.junit" />
++ <import plugin="org.easymock" />
++ <import plugin="org.hamcrest.core" />
++ <import plugin="org.hamcrest.library" />
++ <import plugin="org.mockito.mockito-core" />
++ <import plugin="net.sf.cglib.core" />
++ </requires>
++
+ <plugin
+ id="org.eclipse.ant.optional.junit"
+ download-size="0"
+@@ -55,57 +64,9 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.junit"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+- id="org.easymock"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.hamcrest.core"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.mockito"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="net.bytebuddy.byte-buddy"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="net.bytebuddy.byte-buddy-agent"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.core.tests.harness"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+- <plugin
+- id="org.hamcrest.library"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+ </feature>
+--- ./eclipse.platform.ua/org.eclipse.tips.feature/feature.xml.orig 2018-12-03 15:28:24.822448273 +0000
++++ ./eclipse.platform.ua/org.eclipse.tips.feature/feature.xml 2018-12-03 15:29:45.204209427 +0000
+@@ -32,6 +32,10 @@
+ %license
+ </license>
+
++ <requires>
++ <import plugin="com.google.gson" />
++ </requires>
++
+ <plugin
+ id="org.eclipse.tips.ui"
+ download-size="0"
+@@ -58,13 +62,6 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="com.google.gson"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+ unpack="false"/>
+
+ </feature>
diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch
index e96c840..c35b86d 100644
--- a/eclipse-fix-dropins.patch
+++ b/eclipse-fix-dropins.patch
@@ -1,6 +1,6 @@
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java.orig 2014-03-24 10:49:00.000000000 +0000
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java 2014-03-24 15:39:32.122246214 +0000
-@@ -39,6 +39,7 @@
+@@ -44,6 +44,7 @@
public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
@@ -8,7 +8,7 @@
private static final String SIMPLE_PROFILE_REGISTRY_INTERNAL = "_simpleProfileRegistry_internal_"; //$NON-NLS-1$
private static final String PROFILE_REGISTRY = "profile registry"; //$NON-NLS-1$
private static final String PROFILE_PROPERTIES_FILE = "state.properties"; //$NON-NLS-1$
-@@ -266,6 +267,14 @@
+@@ -279,6 +280,14 @@
//fragments support - remeber the property
internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getExtTimeStamp(), getExtTimeStamp());
agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp()));
@@ -23,7 +23,7 @@
} else {
//This is the first time we create the shared profile. Tag it as such and also remember the timestamp of the base
internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL);
-@@ -299,6 +308,13 @@
+@@ -312,6 +321,13 @@
if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null)
return false;
@@ -39,7 +39,7 @@
if (baseTimestamp == null) {
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
-@@ -570,6 +570,7 @@
+@@ -563,6 +563,7 @@
// get all IUs from all our repos
IQueryResult<IInstallableUnit> allIUs = getAllIUsFromRepos();
@@ -47,7 +47,7 @@
for (Iterator<IInstallableUnit> iter = allIUs.iterator(); iter.hasNext();) {
final IInstallableUnit iu = iter.next();
IInstallableUnit existing = profileIUs.get(iu);
-@@ -583,6 +584,7 @@
+@@ -576,6 +577,7 @@
// (and more expensive) way to find this out is to do an IU profile property query.
if (two == null) {
// the IU is already installed so don't mark it as a dropin now - see bug 404619.
@@ -55,7 +55,7 @@
iter.remove();
continue;
}
-@@ -625,7 +627,7 @@
+@@ -618,7 +620,7 @@
}
// if the IU from the profile is in the "all available" list, then it is already added
// otherwise if it isn't in the repo then we have to remove it from the profile.
@@ -64,7 +64,7 @@
toRemove.add(iu);
}
-@@ -799,8 +801,8 @@
+@@ -792,8 +794,8 @@
IStatus installerPlanStatus = engine.perform(plan.getInstallerPlan(), phaseSet, monitor);
if (!installerPlanStatus.isOK())
return installerPlanStatus;
@@ -77,7 +77,7 @@
}
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig 2018-04-25 20:31:57.931223008 +0100
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2018-04-25 20:32:11.069144336 +0100
-@@ -148,7 +148,7 @@
+@@ -151,7 +151,7 @@
@Override
public boolean performCancel() {
diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
index b484ea6..e979876 100644
--- a/eclipse-mockito.patch
+++ b/eclipse-mockito.patch
@@ -1,54 +1,40 @@
--- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:42:36.169928566 +0000
+++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:56:27.970146198 +0000
-@@ -42,8 +42,9 @@
- org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
- org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0",
+@@ -44,7 +44,7 @@
org.eclipse.osgi.services;bundle-version="3.3.100",
-- org.hamcrest;bundle-version="1.1.0",
-- org.mockito;bundle-version="1.8.4"
-+ org.hamcrest.core,
-+ org.hamcrest.library,
+ org.hamcrest.core;bundle-version="1.3.0",
+ org.hamcrest.library;bundle-version="1.3.0",
+- org.mockito;bundle-version="2.13.0"
+ org.mockito.mockito-core
+ Import-Package: javax.annotation
Eclipse-AutoStart: true
Export-Package: org.eclipse.ui.tests.api,
- 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 @@
+@@ -31,8 +31,9 @@
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",
-- org.hamcrest;bundle-version="1.1.0",
-- org.mockito;bundle-version="1.8.4",
-+ org.hamcrest.core,
++ org.hamcrest.core;bundle-version="1.3.0",
+ org.hamcrest.library;bundle-version="1.3.0",
+- org.mockito;bundle-version="2.13.0",
+ org.mockito.mockito-core,
org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
org.eclipse.test.performance;bundle-version="3.13.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF.orig 2014-04-22 14:31:35.155774270 +0100
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF 2014-04-22 14:33:47.599498477 +0100
-@@ -10,8 +10,8 @@
+@@ -10,8 +10,9 @@
org.w3c.css.sac,
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
org.eclipse.ui;bundle-version="3.106.0",
-- org.hamcrest;bundle-version="1.1.0",
-- org.mockito;bundle-version="1.8.4",
-+ org.hamcrest.core,
++ org.hamcrest.core;bundle-version="1.3.0",
+ org.hamcrest.library;bundle-version="1.3.0",
+- org.mockito;bundle-version="2.13.0",
+ org.mockito.mockito-core,
org.eclipse.equinox.preferences;bundle-version="3.5.200",
org.eclipse.ui.forms,
org.eclipse.ui.views.properties.tabbed
---- 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"
--- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig 2018-08-20 12:54:25.245305107 +0100
+++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF 2018-08-20 12:54:37.952261537 +0100
@@ -33,6 +33,7 @@
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 54451f8..449b9d4 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -70,10 +70,10 @@
</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
-@@ -68,6 +68,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"/>
+@@ -61,6 +61,8 @@
+ <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
+ <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>
+ <plugin id="org.eclipse.core.resources.win32.x86_64"/>
+ <plugin id="com.jcraft.jsch"/>
+ <plugin id="org.apache.ant"/>
</excludes>
@@ -81,13 +81,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
-@@ -44,6 +44,22 @@
+@@ -42,6 +42,23 @@
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"/>
<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.equinox.launcher.gtk.linux.x86" />
+ <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-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch
deleted file mode 100644
index 801e088..0000000
--- a/eclipse-remove-jgit-provider.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- eclipse-platform-parent/pom.xml.orig 2014-11-28 14:54:50.000000000 +0000
-+++ eclipse-platform-parent/pom.xml 2014-11-28 15:32:51.700154985 +0000
-@@ -491,7 +491,7 @@
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- <dependencies>
-- <dependency>
-+ <!-- dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-buildtimestamp-jgit</artifactId>
- <version>${tycho-extras.version}</version>
-@@ -500,19 +500,19 @@
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-sourceref-jgit</artifactId>
- <version>${tycho-extras.version}</version>
-- </dependency>
-+ </dependency-->
- </dependencies>
- <configuration>
- <strictBinIncludes>false</strictBinIncludes>
- <format>${qualifier.format}</format>
-- <timestampProvider>jgit</timestampProvider>
-+ <!--timestampProvider>jgit</timestampProvider-->
- <jgit.ignore>
- pom.xml
- </jgit.ignore>
- <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
-- <sourceReferences>
-+ <!--sourceReferences>
- <generate>true</generate>
-- </sourceReferences>
-+ </sourceReferences-->
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 9b3ddb4..ee9188d 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -2,12 +2,10 @@ 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
-@@ -418,6 +418,36 @@
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-+
-+ <plugin
+@@ -393,6 +393,46 @@
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
+ os="linux"
+ ws="gtk"
@@ -36,10 +34,22 @@ index 7e1f520..734dd10 100644
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
-
- <plugin
- id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -496,6 +526,39 @@
++
++ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.x86"
++ os="linux"
++ ws="gtk"
++ arch="x86"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
++
++ <plugin
+ id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
+ os="macosx"
+ ws="cocoa"
+@@ -480,6 +520,50 @@
download-size="0"
install-size="0"
version="0.0.0"
@@ -76,6 +86,17 @@ index 7e1f520..734dd10 100644
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.x86"
++ os="linux"
++ ws="gtk"
++ arch="x86"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -87,15 +108,15 @@ index 7e1f520..734dd10 100644
<include name="cocoa/macosx/x86_64/**/*"/>
+ <include name="gtk/linux/arm/**/*"/>
+ <include name="gtk/linux/aarch64/**/*"/>
-+ <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/**/*"/>
<include name="gtk/linux/x86_64/**/*"/>
- <include name="win32/win32/x86/**/*"/>
+ <include name="win32/win32/x86_64/**/*"/>
+ </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
-@@ -37,3 +37,15 @@
+@@ -32,3 +32,15 @@
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
@@ -106,11 +127,11 @@ index 7e1f520..734dd10 100644
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
+root.linux.gtk.aarch64.permissions.755=launcher
+
-+root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
-+root.linux.gtk.ppc64.permissions.755=launcher
-+
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
+root.linux.gtk.s390x.permissions.755=launcher
++
++root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
++root.linux.gtk.x86.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
@@ -54,7 +54,11 @@
@@ -119,38 +140,38 @@ index 7e1f520..734dd10 100644
<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.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</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
- <module>bundles/org.eclipse.swt.win32.win32.x86</module>
+ <module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
+ </modules>
--- 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
-@@ -34,3 +34,23 @@
- requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
- requires.7.range = [$version$,$version$]
- requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
+@@ -24,3 +24,23 @@
+ requires.5.name = org.eclipse.swt.gtk.linux.ppc64le
+ requires.5.range = [$version$,$version$]
+ requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
++
++requires.6.namespace = org.eclipse.equinox.p2.iu
++requires.6.name = org.eclipse.swt.gtk.linux.arm
++requires.6.range = [$version$,$version$]
++requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
++
++requires.7.namespace = org.eclipse.equinox.p2.iu
++requires.7.name = org.eclipse.swt.gtk.linux.aarch64
++requires.7.range = [$version$,$version$]
++requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
+
+requires.8.namespace = org.eclipse.equinox.p2.iu
-+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
++requires.8.name = org.eclipse.swt.gtk.linux.s390x
+requires.8.range = [$version$,$version$]
-+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
++requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
+
+requires.9.namespace = org.eclipse.equinox.p2.iu
-+requires.9.name = org.eclipse.swt.gtk.linux.arm
++requires.9.name = org.eclipse.swt.gtk.linux.x86
+requires.9.range = [$version$,$version$]
-+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.10.namespace = org.eclipse.equinox.p2.iu
-+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
-+requires.10.range = [$version$,$version$]
-+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.11.namespace = org.eclipse.equinox.p2.iu
-+requires.11.name = org.eclipse.swt.gtk.linux.s390x
-+requires.11.range = [$version$,$version$]
-+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
++requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(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
@@ -109,7 +109,7 @@
@@ -169,27 +190,27 @@ index 7e1f520..734dd10 100644
</modules>
</profile>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.ppc64</id>
++ <id>build-native-launchers-gtk.linux.s390x</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.ppc64</value>
++ <value>gtk.linux.s390x</value>
+ </property>
+ </activation>
+ <modules>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
+ </modules>
+ </profile>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.s390x</id>
++ <id>build-native-launchers-gtk.linux.x86</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.s390x</value>
++ <value>gtk.linux.x86</value>
+ </property>
+ </activation>
+ <modules>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module>
+ </modules>
+ </profile>
</profiles>
diff --git a/eclipse-support-symlink-bundles.patch b/eclipse-support-symlink-bundles.patch
index 63293fb..17f2e56 100644
--- a/eclipse-support-symlink-bundles.patch
+++ b/eclipse-support-symlink-bundles.patch
@@ -29,9 +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
-@@ -15,8 +15,12 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
- import java.net.*;
+@@ -20,8 +20,12 @@
import java.nio.file.Files;
+ import java.nio.file.attribute.FileTime;
import java.util.*;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
@@ -43,7 +43,7 @@ index ab69b88..d6bf121 100644
public class SimpleConfiguratorUtils {
-@@ -277,6 +281,16 @@ public class SimpleConfiguratorUtils {
+@@ -282,6 +286,16 @@
String symbolicName = tok.nextToken().trim();
String version = tok.nextToken().trim();
URI location = parseLocation(tok.nextToken().trim());
@@ -60,9 +60,9 @@ index ab69b88..d6bf121 100644
int startLevel = Integer.parseInt(tok.nextToken().trim());
boolean markedAsStarted = Boolean.parseBoolean(tok.nextToken());
BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted);
-@@ -400,4 +414,93 @@ public class SimpleConfiguratorUtils {
+@@ -420,4 +434,93 @@
}
- return regularTimestamp;
+ return lastModified;
}
+
+ private static Dictionary<String, String> getOSGiManifest(URI location) {
@@ -154,6 +154,3 @@ index ab69b88..d6bf121 100644
+ return result;
+ }
}
---
-2.5.0
-
diff --git a/eclipse-swt-disable-gtk2.patch b/eclipse-swt-disable-gtk2.patch
deleted file mode 100644
index 28911d6..0000000
--- a/eclipse-swt-disable-gtk2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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" depends="get_version" 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" depends="get_version" if="machine_gtk3">
diff --git a/eclipse.spec b/eclipse.spec
index 2271d8c..5bcfe91 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,12 +1,12 @@
# 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 44643cbda3dfd6f00fbf1b346dae7068df2a9ef9
-%global eclipse_tag I20180906-0745
+%global eclipse_tag I20181203-0600
%global _jetty_version 9.4.11
%global _lucene_version 7.1.0
@@ -17,9 +17,6 @@ Epoch: 1
%ifarch %{arm}
%global eclipse_arch arm
%endif
-%ifarch ppc64 ppc64p7
- %global eclipse_arch ppc64
-%endif
%ifarch s390x x86_64 aarch64 ppc64le
%global eclipse_arch %{_arch}
%endif
@@ -39,8 +36,8 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
-Version: 4.9.0
-Release: 2%{?dist}
+Version: 4.10.0
+Release: 0.1%{?dist}
License: EPL-2.0
URL: http://www.eclipse.org/
@@ -61,10 +58,7 @@ Patch1: eclipse-p2-pick-up-renamed-jars.patch
# Patch for this was contributed. Unlikely to be released.
Patch2: eclipse-ignore-version-when-calculating-home.patch
-# CBI uses timestamps generated from the git commits. We don't have the repo,
-# just source, and we don't want additional dependencies.
-Patch3: eclipse-remove-jgit-provider.patch
-
+# Add support for all arches supported by Fedora
Patch4: eclipse-secondary-arches.patch
Patch5: eclipse-debug-symbols.patch
@@ -88,7 +82,7 @@ Patch15: eclipse-support-symlink-bundles.patch
# javax.el -> javax.el-api
# javax.servlet -> javax.servlet-api
# org.apache.jasper.glassfish -> org.glassfish.web.javax.servlet.jsp
-# javax.annotation -> removed
+# javax.annotation -> javax.annotation-api
# org.w3c.dom.smil -> removed
Patch16: eclipse-feature-plugins-to-category-ius.patch
@@ -99,9 +93,6 @@ Patch20: eclipse-fix-tests.patch
Patch21: eclipse-adjust-droplets.patch
Patch22: eclipse-pde-tp-support-droplets.patch
-# Only build gtk3 backend for SWT
-Patch23: eclipse-swt-disable-gtk2.patch
-
# Disable uses by default
Patch24: eclipse-disable-uses-constraints.patch
@@ -152,7 +143,7 @@ BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(webkit2gtk-4.0)
-BuildRequires: icu4j >= 1:62.1
+BuildRequires: icu4j >= 1:63.1
BuildRequires: ant >= 1.10.5
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 ant-xz ant-junit5
@@ -162,6 +153,7 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-jxpath
BuildRequires: apache-commons-fileupload
+BuildRequires: apache-sshd
BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.1.0
BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2
BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0
@@ -192,6 +184,7 @@ BuildRequires: atinject
BuildRequires: eclipse-ecf-core >= 3.14.1-2
BuildRequires: eclipse-emf-core >= 1:2.15.0-0.2
BuildRequires: eclipse-license2
+BuildRequires: glassfish-annotation-api
BuildRequires: glassfish-el-api >= 3.0.1
BuildRequires: glassfish-el >= 3.0.1
BuildRequires: glassfish-jsp-api >= 2.2.1-4
@@ -273,12 +266,13 @@ Requires: xml-commons-apis
Requires: atinject
Requires: eclipse-ecf-core >= 3.14.0-1
Requires: eclipse-emf-core >= 1:2.14.0-1
+Requires: glassfish-annotation-api
Requires: glassfish-el-api >= 3.0.1
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:62.1
+Requires: icu4j >= 1:63.1
Requires: %{name}-swt = %{epoch}:%{version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
Requires: httpcomponents-core
@@ -372,7 +366,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
%patch0
%patch1
%patch2
-%patch3
%patch4 -p1
%patch5
#%patch6
@@ -383,7 +376,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
%patch20
%patch21
%patch22
-%patch23
%patch24
%patch26
%patch27
@@ -394,10 +386,11 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
%patch29
%patch30 -p1
-# Use ecj when bootstrapping
-%if %{bootstrap}
-sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platform-parent/pom.xml
-%endif
+# Remove jgit deps because building from source tarball, not a git repo
+%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
+%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
+%pom_xpath_remove 'pom:configuration/pom:timestampProvider' eclipse-platform-parent
+%pom_xpath_remove 'pom:configuration/pom:sourceReferences' eclipse-platform-parent
# Resolving the target platform requires too many changes, so don't use it
%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent
@@ -417,6 +410,7 @@ sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platf
%pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.console.ssh.tests rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles
@@ -430,15 +424,17 @@ sed -i -e 's/groupId>org.eclipse.jdt</groupId>org.eclipse.tycho</' eclipse-platf
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2
+%pom_disable_module bundles/org.eclipse.equinox.p2.tests.optimizers rt.equinox.p2
%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2
# Don't need annotations for obsolete JDKs
%pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core
-%pom_xpath_remove "plugin[@version='1.1.300.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
+%pom_xpath_remove "plugin[@version='1.1.400.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d' \
eclipse.jdt.core/org.eclipse.jdt.core.tests.{model,builder,compiler}/META-INF/MANIFEST.MF \
eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF \
eclipse.jdt.ui/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF
+sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
# Disable examples
%pom_disable_module bundles/org.eclipse.sdk.examples eclipse.platform.releng
@@ -450,10 +446,13 @@ sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d'
%pom_disable_module bundles/org.eclipse.equinox.servletbridge rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles
+# Missing dep on reddeer
+%pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui
+
# This part generates secondary fragments using primary fragments
for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do
utils/ensure_arch.sh "$dir" x86 arm
- utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64
+ utils/ensure_arch.sh "$dir" x86_64 aarch64
done
# Remove platform-specific stuff that we don't care about to reduce build time
@@ -479,8 +478,11 @@ for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.laun
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
+ module=$(grep ">bundles/$b<" rt.equinox.bundles/pom.xml || :)
+ if [ -n "$module" ] ; then
+ %pom_disable_module bundles/$b rt.equinox.bundles
+ %pom_xpath_remove -f "plugin[@id='$b']" rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml
+ fi
done
for b in `ls eclipse.platform.team/bundles/org.eclipse.core.net/fragments/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{eclipse_arch}$)'` ; do
%pom_disable_module bundles/org.eclipse.core.net/fragments/$b eclipse.platform.team
@@ -498,7 +500,6 @@ done
%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 \
@@ -507,7 +508,7 @@ 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
+ for arch in x86 x86_64 arm aarch64 ppc64le s390x ; do
if [ "$arch" != "%{eclipse_arch}" ] ; then
%pom_xpath_remove -f "plugin[@arch='$arch']" $f
fi
@@ -516,7 +517,7 @@ done
# Fix versions in secondary arch fragments
fix_files=$(grep -lr 3.107.100 eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*)
-sed -i -e "s/3.107.100/3.108.0/" $fix_files
+sed -i -e "s/3.107.100/3.109.0/" $fix_files
fix_files=$(grep -lr '1\.1\.[67]00' rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.*)
sed -i -e "s/1\.1\.[67]00/1.1.800/" $fix_files
sed -i -e "/Fragment-Host/s/\(bundle-version=\).*/\1\"1.0.0\"/" $fix_files
@@ -546,15 +547,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
-# 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
-
-# Use unbundled mockito
-%pom_xpath_remove "plugin[@id='org.mockito']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
-%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
@@ -571,10 +563,9 @@ 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 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 \
+for f in 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
+ eclipse.platform.team/bundles/org.eclipse.core.net.linux.*/META-INF/MANIFEST.MF ; do
echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
done
@@ -612,6 +603,11 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/
+# Temporary until mockito updated in Fedora
+grep -l -Z -r "org.mockito.ArgumentMatchers" eclipse.platform.ui/tests | xargs -0 sed -i -- 's/org.mockito.ArgumentMatchers/org.mockito.Matchers/'
+sed -i -e 's/populateDefinition(isNull(), isNull()/populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class)/' \
+ "eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java"
+
# This test doesn't build on 32bit
# See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=534174
rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java
@@ -664,7 +660,7 @@ mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded
# Qualifier generated from last modification time of source tarball
QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
-%mvn_build -j -f -- -DforceContextQualifier=$QUALIFIER \
+%mvn_build -j -f -- -e -DforceContextQualifier=$QUALIFIER \
%if %{bootstrap}
-P !api-generation,!build-docs \
%endif
@@ -1083,6 +1079,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Thu Nov 29 2018 Mat Booth <mat.booth(a)redhat.com> - 1:4.10.0-0.1
+- Update to latest I-build
+- Enable bootstrap mode
+
* Fri Sep 28 2018 Jeff Johnston <jjohnstn(a)redhat.com> - 1:4.9.0-2
- Add org.eclipse.equinox.executable for building RCP apps
diff --git a/sources b/sources
index 469688b..c28a3f3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (eclipse-platform-sources-I20180906-0745.tar.xz) = eed6fbb7d160713ba2c043e7b218a778fa493e1187fbaf6b0a36a231ab1a35d61ecc2793b179d911d6e34105534ab47cc2d0fabe54ac216b5371adab7606c6a5
+SHA512 (eclipse-platform-sources-I20181203-0600.tar.xz) = 3f2309a4094721fc6dfe643c86249e5d143fcf2c402b5871234bda60f330140f16d5062d86aa0c3125d43f7524aaeb9182711a0e6ced573a1efe3105c0dd03f8
SHA512 (org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz) = ef02f54deefd154265122fa0191c8d69bbb135e026171de147a7fb3af83bb26523ea866d19aa7c7cc184c8e05ad55e54846a909bea69bd1bc6cd57005d055ebf
5 years, 5 months
Architecture specific change in rpms/hypre.git
by githook-noreply@fedoraproject.org
The package rpms/hypre.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/hypre.git/commit/?id=6145042b3829....
Change:
-%ifarch s390 s390x
Thanks.
Full change:
============
commit 9f5cc3e705f6897c7c3da4cdc0dd9eb49293ab70
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Mon Dec 3 16:41:39 2018 +0000
- Don't link bundled blas and lapack
diff --git a/hypre.spec b/hypre.spec
index 8c37dbf..535491b 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -25,7 +25,7 @@
Name: hypre
Version: 2.14.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -169,7 +169,7 @@ pushd src
--with-lapack --enable-shared --with-superlu --with-superlu-include=%_includedir/SuperLU \
LDFLAGS="-lsuperlu -fopenmp -lm $LDFLAGS -Wl,--as-needed" \
CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_ -fopenmp"
-make %{?_smp_mflags}
+make %{?_smp_mflags} BLASFILES= LAPACKFILES= BLASLIBDIRS=
popd
%global do_mpi_build \
@@ -180,7 +180,7 @@ popd
--enable-shared --with-dsuperlu --with-dsuperlu-include=$MPI_INCLUDE/superlu_dist \\\
LDFLAGS=" -lsuperlu_dist -lsuperlu -lptscotch -Wl,--as-needed $LDFLAGS" \\\
CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_" \
- make %{?_smp_mflags}
+ make %{?_smp_mflags} BLASFILES= LAPACKFILES= BLASLIBDIRS=
%if %{with openmpi}
pushd openmpi
@@ -286,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Mon Dec 3 2018 Dave Love <loveshack(a)fedoraproject.org> - 2.14.0-5
+- Don't link bundled blas and lapack
+
* Thu Jul 19 2018 Sandro Mani <manisandro(a)gmail.com> - 2.14.0-4
- Rebuild (scotch)
commit 115786aa668113cfb162ecdd5758112bd30a2b62
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Thu Jul 19 14:30:42 2018 +0200
Rebuild (scotch)
diff --git a/hypre.spec b/hypre.spec
index f878e32..8c37dbf 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -25,7 +25,7 @@
Name: hypre
Version: 2.14.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -286,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Thu Jul 19 2018 Sandro Mani <manisandro(a)gmail.com> - 2.14.0-4
+- Rebuild (scotch)
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.14.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 4e88c13bd5202b73b834cc31a42912163d8acdcc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 05:29:15 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/hypre.spec b/hypre.spec
index 6517d33..f878e32 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -25,7 +25,7 @@
Name: hypre
Version: 2.14.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -286,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.14.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Tue Apr 24 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.14.0-2
- Build hypre-openmpi on s390x (#1571450)
commit 6145042b382944850e3c7d273b50710f02d852d9
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Thu Apr 26 10:09:07 2018 +0100
Build hypre-openmpi on s390x (#1571450)
diff --git a/hypre.spec b/hypre.spec
index ecf76fd..6517d33 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -11,10 +11,9 @@
%bcond_without mpich
%endif
-%ifarch s390 s390x
-%bcond_with openmpi
-%else
+%if 0%{?fedora}
%bcond_without openmpi
+%bcond_without mpich
%endif
%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
@@ -26,7 +25,7 @@
Name: hypre
Version: 2.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -240,8 +239,12 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%_mpich_unload
%endif
+%if 0%{?ldconfig_scriptlets}
+%ldconfig_scriptlets
+%else
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%endif
%{!?_licensedir:%global license %doc}
@@ -283,6 +286,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Tue Apr 24 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.14.0-2
+- Build hypre-openmpi on s390x (#1571450)
+
* Fri Mar 23 2018 Dave Love <loveshack(a)fedoraproject.org> - 2.14.0-1
- Update to 2.14.0 (#1557645)
- Reinstate superlu and use superlu_dist
commit 95a7df1aa6b503eee71a26f2d6a56fa4ab1997e2
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Mon Mar 26 18:34:44 2018 +0100
Update to 2.14.0 (#1557645)
Reinstate superlu and use superlu_dist
diff --git a/hypre-test.patch b/hypre-test.patch
index 56e26f4..b57beeb 100644
--- a/hypre-test.patch
+++ b/hypre-test.patch
@@ -1,21 +1,11 @@
-*** hypre-2.11.2/src/test/runtest.sh~ 2017-03-13 19:37:24.000000000 +0000
---- hypre-2.11.2/src/test/runtest.sh 2017-05-04 12:54:11.105714813 +0000
-***************
-*** 11,17 ****
- RunEcho=""
- ExecFileNames="" # string of executable file names used
- TestDirNames="" # string of names of TEST_* directories used
-! HOST=`hostname`
- NumThreads=0 # number of OpenMP threads to use if > 0
- Valgrind="" # string to add to MpirunString when using valgrind
-
---- 11,17 ----
- RunEcho=""
- ExecFileNames="" # string of executable file names used
- TestDirNames="" # string of names of TEST_* directories used
-! HOST=
- NumThreads=0 # number of OpenMP threads to use if > 0
- Valgrind="" # string to add to MpirunString when using valgrind
-
-
-Diff finished. Thu May 4 12:54:16 2017
+*** hypre-2.14.0/src/test/runtest.sh~
+--- hypre-2.14.0/src/test/runtest.sh
+@@ -11,7 +11,7 @@
+ RunEcho=""
+ ExecFileNames="" # string of executable file names used
+ TestDirNames="" # string of names of TEST_* directories used
+-HOST=`hostname`
++HOST=
+ NumThreads=0 # number of OpenMP threads to use if > 0
+ Valgrind="" # string to add to MpirunString when using valgrind
+ mpibind="" # string to add to MpirunString when using mpibind
diff --git a/hypre.spec b/hypre.spec
index cf75b15..ecf76fd 100644
--- a/hypre.spec
+++ b/hypre.spec
@@ -25,8 +25,8 @@
%endif
Name: hypre
-Version: 2.13.0
-Release: 6%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
Summary: High performance matrix preconditioners
# FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't
# look copyright-significant.
@@ -40,12 +40,6 @@ Patch2: hypre-test.patch
BuildRequires: gcc-c++ gcc-gfortran automake libtool libtool-ltdl-devel
BuildRequires: SuperLU-devel
-%if %{with openmpi}
-BuildRequires: openmpi-devel superlu_dist-openmpi-devel ptscotch-openmpi-devel
-%endif
-%if %{with mpich}
-BuildRequires: mpich-devel superlu_dist-mpich-devel ptscotch-mpich-devel
-%endif
%if %use_openblas
BuildRequires: openblas-devel
%else
@@ -82,6 +76,7 @@ Development files for %name
%package openmpi
Summary: High performance matrix preconditioners - openmpi
Requires: openmpi%{?_isa}
+BuildRequires: superlu_dist-openmpi-devel ptscotch-openmpi-devel
%description openmpi
%desc
@@ -91,7 +86,8 @@ This is the openmpi version.
%package openmpi-devel
Summary: Development files for %name-openmpi
Requires: %{name}-openmpi%{?_isa} = %{version}-%{release}
-Requires: openmpi-devel%{?_isa} SuperLU-devel%{?_isa}
+Requires: openmpi-devel%{?_isa} superlu_dist-openmpi-devel%{?_isa}
+Requires: ptscotch-openmpi-devel%{?_isa}
%if %use_openblas
Requires: openblas-devel%{?_isa}
%else
@@ -106,6 +102,7 @@ Development files for %name-openmpi
%package mpich
Summary: High performance matrix preconditioners - mpich
Requires: mpich%{?_isa}
+BuildRequires: superlu_dist-mpich-devel ptscotch-mpich-devel
%description mpich
%desc
@@ -121,7 +118,7 @@ Requires: mpich-devel
%else
Requires: mpich-devel%{?_isa}
%endif
-Requires: SuperLU-devel%{?_isa}
+Requires: superlu_dist-mpich-devel%{?_isa} ptscotch-mpich-devel%{?_isa}
%if %use_openblas
Requires: openblas-devel%{?_isa}
%else
@@ -143,8 +140,8 @@ Documentation for hypre
%prep
%setup -q -n %name-%version
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .soname
+%patch2 -p1 -b .test
find \( -name \*.[ch] -o -name \*.cxx \) -perm /=x -exec chmod 0644 {} \;
@@ -157,23 +154,22 @@ cp -a src mpich
%build
%if %use_openblas
-%global lalibs --with-blas-lib=-lopenblas --with-lapack-lib=-lopenblas
+%global lalibs --with-blas-libs=openblas --with-lapack-libs=openblas --with-blas-lib-dirs=%_libdir --with-lapack-lib-dirs=%_libdir --with-superlu --with-superlu-include=%_includedir/SuperLU
%else
%if 0%{?el6}
-%global lalibs --with-blas-lib="-L%_libdir/atlas -lf77blas" --with-lapack-lib="-L%_libdir/atlas -llappack"
+%global lalibs --with-blas-libs=f77blas --with-lapack-libs=lapack --with-blas-lib-dirs=%_libdir/atlas --with-lapack-lib-dirs=%_libdir/atlas --with-superlu --with-superlu-include=%_includedir/SuperLU
%else
-%global lalibs --with-blas-lib-dirs="-L%_libdir/atlas -lsatlas" --with-lapack-lib-dirs="-L%_libdir/atlas -lsatlas"
+%global lalibs --with-blas-libs=satlas --with-lapack-libs=satlas --with-blas-lib-dirs=%_libdir/atlas --with-lapack-lib-dirs=%_libdir/atlas --with-superlu --with-superlu-include=%_includedir/SuperLU
%endif
%endif
pushd src
# -O3 seems like a good idea for vectorization, at least.
-%configure --without-MPI --with-timing \
+%configure --without-MPI --with-timing --with-openmp \
%lalibs \
- --enable-shared --with-superlu --with-superlu-lib=-lsuperlu \
- --with-superlu-include=%_includedir/SuperLU --with-mli \
- LDFLAGS="$LDFLAGS -Wl,--as-needed -lsuperlu" \
- CFLAGS="$CFLAGS -O3"
+ --with-lapack --enable-shared --with-superlu --with-superlu-include=%_includedir/SuperLU \
+ LDFLAGS="-lsuperlu -fopenmp -lm $LDFLAGS -Wl,--as-needed" \
+ CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_ -fopenmp"
make %{?_smp_mflags}
popd
@@ -181,10 +177,10 @@ popd
%configure --prefix=$MPI_HOME --with-MPI --with-MPI-include=$MPI_INCLUDE \\\
--with-MPI-lib-dirs=$MPI_LIB --with-timing --without-openmp \\\
%lalibs \\\
- --enable-shared --with-dsuperlu --with-dsuperlu-lib=-lsuperlu_dist \\\
- --with-dsuperlu-include=$MPI_INCLUDE/superlu_dist \\\
- LDFLAGS="$LDFLAGS -Wl,--as-needed -lsuperlu_dist" \\\
- CFLAGS="$CFLAGS -O3" \
+ --with-fei --with-mli \\\
+ --enable-shared --with-dsuperlu --with-dsuperlu-include=$MPI_INCLUDE/superlu_dist \\\
+ LDFLAGS=" -lsuperlu_dist -lsuperlu -lptscotch -Wl,--as-needed $LDFLAGS" \\\
+ CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_" \
make %{?_smp_mflags}
%if %{with openmpi}
@@ -287,6 +283,10 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \
%doc docs/*.pdf
%changelog
+* Fri Mar 23 2018 Dave Love <loveshack(a)fedoraproject.org> - 2.14.0-1
+- Update to 2.14.0 (#1557645)
+- Reinstate superlu and use superlu_dist
+
* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - 2.13.0-6
- Rebuild to fix GCC 8 mis-compilation
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
commit 5b835636754edc14df709c377abbcd6690470eb4
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Sat Mar 24 19:24:20 2018 +0000
New source
diff --git a/.gitignore b/.gitignore
index 55d48fa..1ac86ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/hypre-2.11.1.tar.gz
/hypre-2.11.2.tar.gz
/hypre-2.13.0.tar.gz
+/hypre-2.14.0.tar.gz
diff --git a/sources b/sources
index 8b13c11..6abd793 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hypre-2.13.0.tar.gz) = e78d16a561b710cefc3b1ef7f3ba768caffd532e65c2368fd2f98497b7a46f521f4f86fb504238d06fbd1f8040a44d890c366fbd17d197440970f7b9be052303
+SHA512 (hypre-2.14.0.tar.gz) = c7b59fb7ab1cc906e339fcc00603898e44234a65aa74600f740bc825aa94aa66ff0cbd4bd4b7f339c0d28ff5bd9494f15b57f2017a22348fee14b4e8333f1e6c
5 years, 5 months
Architecture specific change in rpms/golang-github-go-tomb-tomb.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-go-tomb-tomb.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-go-tomb-tomb.git/co....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit a8f39a577f3cb98208632cb1095ba4c4c23a5cba
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Wed Oct 31 17:26:00 2018 +0100
Update to new Go packaging
Bump to commit dd632973f1e7218eb1089048e0798ec9ae7dceb8 and d5d1b5820637886def9eef33e03a27a9f166942c
diff --git a/.gitignore b/.gitignore
index 2adb01d..c7d09f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/tomb-dd63297.tar.gz
/tomb-d5d1b58.tar.gz
+/tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz
+/tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz
diff --git a/golang-github-go-tomb-tomb.spec b/golang-github-go-tomb-tomb.spec
index 65de833..ad75a5c 100644
--- a/golang-github-go-tomb-tomb.spec
+++ b/golang-github-go-tomb-tomb.spec
@@ -1,219 +1,108 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%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 go-tomb
-%global repo tomb
-# https://github.com/go-tomb/tomb
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path gopkg.in/tomb.v2
+%global goipath github.com/go-tomb/tomb
%global commit d5d1b5820637886def9eef33e03a27a9f166942c
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global import_path_sec gopkg.in/v2/tomb
+%global import_path gopkg.in/v2/tomb
+%global import_path_sec gopkg.in/tomb.v2
%global v1_commit dd632973f1e7218eb1089048e0798ec9ae7dceb8
%global v1_shortcommit %(c=%{v1_commit}; echo ${c:0:7})
-%global v1_provider_prefix github.com/go-tomb/tomb
-%global v1_import_path gopkg.in/tomb.v1
-%global v1_import_path_sec gopkg.in/v1/tomb
-%global v1_name golang-gopkg-tomb-v1
+%global v1_import_path gopkg.in/v1/tomb
+%global v1_import_path_sec gopkg.in/tomb.v1
+%global devel_main golang-gopkg-tomb-devel-v2
-Name: golang-%{provider}-%{project}-%{repo}
+%gometa
+
+Name: golang-github-go-tomb-tomb
Version: 0
-Release: 0.13.git%{shortcommit}%{?dist}
-Summary: Helps with clean goroutine termination in the Go language
+Release: 15%{?dist}
+Summary: The tomb package helps with clean goroutine termination in the Go language
License: BSD
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-Source1: https://%{v1_provider_prefix}/archive/%{v1_commit}/%{repo}-%{v1_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 %{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}
+URL: %{gourl}
+Source0: %{gosource}
+Source1: https://%{goipath}/archive/%{v1_commit}/tomb-%{v1_commit}.tar.gz
%description
-%{summary}
+%{summary}.
-%if 0%{?with_devel}
%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check}
-BuildRequires: golang(golang.org/x/net/context)
-%endif
+Summary: Enables Go programs to comfortably encode and decode YAML values
+BuildArch: noarch
-Requires: golang(golang.org/x/net/context)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path_sec}) = %{version}-%{release}
+BuildRequires: golang(gopkg.in/check.v1)
+Requires: golang(gopkg.in/check.v1)
%description devel
-%{summary}
+%{summary}.
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-
-%package -n %{v1_name}-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check}
-%endif
+%{v1_import_path} prefix.
-Provides: golang(%{v1_import_path}) = %{version}-%{release}
-Provides: golang(%{v1_import_path_sec}) = %{version}-%{release}
+%package devel-v2
+Summary: Enables Go programs to comfortably encode and decode YAML values
+BuildArch: noarch
-%description -n %{v1_name}-devel
-%{summary}
+%description devel-v2
+%{summary}.
This package contains library source intended for
building other packages which use import path with
-%{v1_import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-# 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}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{v1_commit} -T -b 1
-%setup -q -n %{repo}-%{commit}
-
-%build
+%setup -q -n tomb-%{v1_commit} -T -b 1
+%forgesetup
%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
-install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
-echo "%%dir %%{gopath}/src/%%{import_path_sec}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
- echo "%%dir %%{gopath}/src/%%{import_path_sec}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path_sec}/$file
- echo "%%{gopath}/src/%%{import_path_sec}/$file" >> devel.file-list
-done
-
-pushd ../%{repo}-%{v1_commit}
-
-install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path}/
-echo "%%dir %%{gopath}/src/%%{v1_import_path}/." >> ../%{repo}-%{commit}/v1_devel.file-list
-install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
-echo "%%dir %%{gopath}/src/%%{v1_import_path_sec}/." >> ../%{repo}-%{commit}/v1_devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{v1_import_path}/$(dirname $file)" >> ../%{repo}-%{commit}/v1_devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{v1_import_path}/$file
- echo "%%{gopath}/src/%%{v1_import_path}/$file" >> ../%{repo}-%{commit}/v1_devel.file-list
- echo "%%dir %%{gopath}/src/%%{v1_import_path_sec}/$(dirname $file)" >> ../%{repo}-%{commit}/v1_devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/$file
- echo "%%{gopath}/src/%%{v1_import_path_sec}/$file" >> ../%{repo}-%{commit}/v1_devel.file-list
-done
-
+%goinstall
+%goinstall -i %{import_path} -o devel.file-list
+%goinstall -i %{import_path_sec} -o devel.file-list
+
+cw=$(pwd)
+pushd ../tomb-%{v1_commit}
+%goinstall -i %{v1_import_path} -o ${cw}/v1_devel.file-list
+%goinstall -i %{v1_import_path_sec} -o ${cw}/v1_devel.file-list
+
+# TODO(jchaloup): create rpm macros for this!!!
+#github.com/go-tomb/tomb -> gopkg.in/v2/tomb
+pushd %{buildroot}/%{gopath}/src/%{import_path}/
+sed -i 's/"github\.com\/go-tomb\/tomb/"gopkg\.in\/v2\/tomb/g' \
+ $(find . -name '*.go')
+#'github.com/go-tomb/tomb -> gopkg.in/tomb.v2
+cd %{buildroot}/%{gopath}/src/%{import_path_sec}/
+sed -i 's/"github\.com\/go-tomb\/tomb/"gopkg\.in\/tomb\.v2/g' \
+ $(find . -name '*.go')
+#gopkg.in/v1/tomb -> gopkg.in/tomb.v1
+cd %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+sed -i 's/"gopkg\.in\/v1\/tomb/"gopkg\.in\/tomb\.v1/g' \
+ $(find . -name '*.go')
popd
-%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.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-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}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks
+pushd %{buildroot}/%{gopath}/src/%{import_path}/
+%gochecks -i %{import_path}
+cd %{buildroot}/%{gopath}/src/%{import_path_sec}/
+%gochecks
+popd
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
-%files devel -f devel.file-list
+%files devel -f v1_devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{import_path_sec}
-%files -n %{v1_name}-devel -f v1_devel.file-list
+%files devel-v2 -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{v1_import_path_sec}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Oct 31 2018 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.14.20181031gitd5d1b58
+- Update to new Go packaging
+- Bump to commit dd632973f1e7218eb1089048e0798ec9ae7dceb8 and d5d1b5820637886def9eef33e03a27a9f166942c
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.13.gitd5d1b58
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
@@ -258,4 +147,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
* Mon Jun 15 2015 Marek Skalick <mskalick(a)redhat.com> - 0-0.1.git14b3d72
- First package for Fedora
resolves: #1232221
-
diff --git a/sources b/sources
index e22ca44..c68f8cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tomb-dd63297.tar.gz) = 4d566a0f57513f11666fa43c3b991d2356007db54df4f38b97b9719d623b123a6a8a5ed02d14b5d6020fe39162bb3247a7ee1e4054493ff89a4de2cbbe156e89
-SHA512 (tomb-d5d1b58.tar.gz) = 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
+SHA512 (tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz) = 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
+SHA512 (tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz) = 4d566a0f57513f11666fa43c3b991d2356007db54df4f38b97b9719d623b123a6a8a5ed02d14b5d6020fe39162bb3247a7ee1e4054493ff89a4de2cbbe156e89
commit 70de83bcbab120c33eca4fe3a450f821da26d4e7
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 03:35:38 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/golang-github-go-tomb-tomb.spec b/golang-github-go-tomb-tomb.spec
index ae4d535..65de833 100644
--- a/golang-github-go-tomb-tomb.spec
+++ b/golang-github-go-tomb-tomb.spec
@@ -40,7 +40,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.12.git%{shortcommit}%{?dist}
+Release: 0.13.git%{shortcommit}%{?dist}
Summary: Helps with clean goroutine termination in the Go language
License: BSD
URL: https://%{provider_prefix}
@@ -214,6 +214,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%endif
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.13.gitd5d1b58
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.12.gitd5d1b58
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
5 years, 5 months
Architecture specific change in rpms/rust-rand0.5.git
by githook-noreply@fedoraproject.org
The package rpms/rust-rand0.5.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/rust-rand0.5.git/commit/?id=caf49....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit caf49649d129da9b2c43faa80797a9369c422a21
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Dec 3 14:29:44 2018 +0100
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ec2870
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/rand-0.5.5.crate
diff --git a/rand-fix-metadata.diff b/rand-fix-metadata.diff
new file mode 100644
index 0000000..f548296
--- /dev/null
+++ b/rand-fix-metadata.diff
@@ -0,0 +1,34 @@
+--- rand-0.5.5/Cargo.toml 1970-01-01T01:00:00+01:00
++++ rand-0.5.5/Cargo.toml 2018-10-27T02:24:57.333044+02:00
+@@ -22,6 +22,7 @@
+ categories = ["algorithms", "no-std"]
+ license = "MIT/Apache-2.0"
+ repository = "https://github.com/rust-lang-nursery/rand"
++exclude = ["/utils/*", "/.travis.yml", "/appveyor.yml"]
+ [package.metadata.docs.rs]
+ all-features = true
+ [dependencies.log]
+@@ -48,22 +49,9 @@
+ i128_support = []
+ nightly = ["i128_support"]
+ serde1 = ["serde", "serde_derive", "rand_core/serde1"]
+-std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi", "fuchsia-zircon"]
+-[target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
+-version = "0.0.3"
+-optional = true
+-[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-zircon]
+-version = "0.3.2"
+-optional = true
++std = ["rand_core/std", "alloc", "libc"]
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2"
+-optional = true
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = ["minwindef", "ntsecapi", "profileapi", "winnt"]
+-optional = true
+-[target.wasm32-unknown-unknown.dependencies.stdweb]
+-version = "0.4"
+ optional = true
+ [badges.appveyor]
+ repository = "alexcrichton/rand"
diff --git a/rust-rand0.5.spec b/rust-rand0.5.spec
new file mode 100644
index 0000000..9097f65
--- /dev/null
+++ b/rust-rand0.5.spec
@@ -0,0 +1,182 @@
+# Generated by rust2rpm
+# * Tests are run in infrastructure
+%bcond_with check
+%global debug_package %{nil}
+
+%global crate rand
+
+Name: rust-%{crate}0.5
+Version: 0.5.5
+Release: 1%{?dist}
+Summary: Random number generators and other randomness functionality
+
+# Upstream license specification: MIT/Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/rand
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+# Initial patched metadata
+# * Exclude CI files, https://github.com/rust-random/rand/pull/635
+# * Remove non-unix dependencies
+Patch0: rand-fix-metadata.diff
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0)
+BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0)
+BuildRequires: (crate(rand_core) >= 0.2.0 with crate(rand_core) < 0.3.0)
+BuildRequires: (crate(rand_core/alloc) >= 0.2.0 with crate(rand_core/alloc) < 0.3.0)
+BuildRequires: (crate(rand_core/serde1) >= 0.2.0 with crate(rand_core/serde1) < 0.3.0)
+BuildRequires: (crate(rand_core/std) >= 0.2.0 with crate(rand_core/std) < 0.3.0)
+BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0)
+BuildRequires: (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0)
+%if %{with check}
+BuildRequires: (crate(bincode/default) >= 1.0.0 with crate(bincode/default) < 2.0.0)
+%endif
+
+%global _description \
+Random number generators and other randomness functionality.
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md CHANGELOG.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+alloc-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+alloc-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "alloc" feature of "%{crate}" crate.
+
+%files -n %{name}+alloc-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+i128_support-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+i128_support-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "i128_support" feature of "%{crate}" crate.
+
+%files -n %{name}+i128_support-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+libc-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+libc-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libc" feature of "%{crate}" crate.
+
+%files -n %{name}+libc-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+log-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+log-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "log" feature of "%{crate}" crate.
+
+%files -n %{name}+log-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+
+%package -n %{name}+serde-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+serde1-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde1-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde1" feature of "%{crate}" crate.
+
+%files -n %{name}+serde1-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+serde_derive-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde_derive-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde_derive" feature of "%{crate}" crate.
+
+%files -n %{name}+serde_derive-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package -n %{name}+std-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Mon Dec 03 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.5.5-1
+- Initial import
diff --git a/sources b/sources
new file mode 100644
index 0000000..f6d1560
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (rand-0.5.5.crate) = e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
5 years, 5 months
Architecture specific change in rpms/ursa-major.git
by githook-noreply@fedoraproject.org
The package rpms/ursa-major.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/ursa-major.git/commit/?id=84a9b91...
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=57ad88d....
Change:
+ExclusiveArch: %{ix86} x86_64 noarch
+ExclusiveArch: noarch x86_64
Thanks.
Full change:
============
commit 341f4a732627f1cfa9aeddf1725aa69592bacb41
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 15:17:09 2018 +0800
Minor update to changelog
diff --git a/ursa-major.spec b/ursa-major.spec
index 76de2b8..edd8857 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -180,7 +180,7 @@ py.test
%changelog
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-4
-- build can be scheduled to i386 arch, include %{ix86}
+- build can be scheduled to i386 arch, include ix86
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
commit 84a9b916805750b13579f4c885717e4d044f2f8b
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 14:51:09 2018 +0800
Include %{ix86} arch
We have 'ExclusiveArch: x86_64 noarch', but job can still be
scheduled to i386 arch, include ix86 to workaround.
diff --git a/ursa-major.spec b/ursa-major.spec
index c5dd470..76de2b8 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools
@@ -15,9 +15,10 @@ URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
BuildArch: noarch
-# 1. libmodulemd is not available for ppc or i686
-# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only
-ExclusiveArch: noarch x86_64
+# EPEL: libmodulemd is not available for ppc or i686
+# Fedora: include ix86 as build can be scheduled to i386 arch, otherwise there is
+# error: Architecture is not included: i386
+ExclusiveArch: %{ix86} x86_64 noarch
BuildRequires: help2man
@@ -178,8 +179,11 @@ py.test
%changelog
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-4
+- build can be scheduled to i386 arch, include %{ix86}
+
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
-- libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
commit 57ad88d4da72464b73281401fbdbddecd9c3a084
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 14:09:15 2018 +0800
Limit to x86_64 build
Seeing libmodulemd is missing from ppc64le buildroot, just enable
x86_64 build.
diff --git a/ursa-major.spec b/ursa-major.spec
index fbc578d..c5dd470 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools
@@ -15,8 +15,9 @@ URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
BuildArch: noarch
-# libmodulemd is not available for ppc or i686
-ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+# 1. libmodulemd is not available for ppc or i686
+# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+ExclusiveArch: noarch x86_64
BuildRequires: help2man
@@ -177,6 +178,9 @@ py.test
%changelog
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
+- libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
5 years, 5 months
Architecture specific change in rpms/ursa-major.git
by githook-noreply@fedoraproject.org
The package rpms/ursa-major.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/ursa-major.git/commit/?id=89fb47c....
Change:
+ExclusiveArch: %{ix86} x86_64 noarch
Thanks.
Full change:
============
commit 89fb47cf54f297f7e1131051471e59cee4f60c77
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 14:51:09 2018 +0800
Include %{ix86} arch
We have 'ExclusiveArch: x86_64 noarch', but job can still be
scheduled to i386 arch, include ix86 to workaround.
diff --git a/ursa-major.spec b/ursa-major.spec
index c5dd470..76de2b8 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools
@@ -15,9 +15,10 @@ URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
BuildArch: noarch
-# 1. libmodulemd is not available for ppc or i686
-# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only
-ExclusiveArch: noarch x86_64
+# EPEL: libmodulemd is not available for ppc or i686
+# Fedora: include ix86 as build can be scheduled to i386 arch, otherwise there is
+# error: Architecture is not included: i386
+ExclusiveArch: %{ix86} x86_64 noarch
BuildRequires: help2man
@@ -178,8 +179,11 @@ py.test
%changelog
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-4
+- build can be scheduled to i386 arch, include %{ix86}
+
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
-- libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
5 years, 5 months
Architecture specific change in rpms/ursa-major.git
by githook-noreply@fedoraproject.org
The package rpms/ursa-major.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/ursa-major.git/commit/?id=d64f4b3....
Change:
+ExclusiveArch: noarch x86_64
Thanks.
Full change:
============
commit d64f4b32f4657bd674fa546722a2aa9432146522
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 14:09:15 2018 +0800
Limit to x86_64 build
Seeing libmodulemd is missing from ppc64le buildroot, just enable
x86_64 build.
diff --git a/ursa-major.spec b/ursa-major.spec
index fbc578d..c5dd470 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools
@@ -15,8 +15,9 @@ URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
BuildArch: noarch
-# libmodulemd is not available for ppc or i686
-ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+# 1. libmodulemd is not available for ppc or i686
+# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+ExclusiveArch: noarch x86_64
BuildRequires: help2man
@@ -177,6 +178,9 @@ py.test
%changelog
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
+- libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
5 years, 5 months
Architecture specific change in rpms/ursa-major.git
by githook-noreply@fedoraproject.org
The package rpms/ursa-major.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/ursa-major.git/commit/?id=9718c30....
Change:
+ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
Thanks.
Full change:
============
commit 9718c30dbb01433984f3478800161653473cd619
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 13:38:49 2018 +0800
Initial import
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b3ec1d3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/ursa-major-0.1.1.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..f552a64
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (ursa-major-0.1.1.tar.gz) = 6515eab4a9b3bdf0acb055a36bb2b76f4387cef9c4aff3f75c87555d7afa2897feb4feba1d26a588db26a1321fb473a570c876991890489a91d96f579c8ba3c2
diff --git a/ursa-major.spec b/ursa-major.spec
new file mode 100644
index 0000000..fbc578d
--- /dev/null
+++ b/ursa-major.spec
@@ -0,0 +1,184 @@
+%if 0%{?fedora}
+# we have some koji hubs doesn't support Python3 with kerberos auth
+# at this moment, so we build with Python2 for all platforms now
+%global with_python3 0
+%endif
+
+Name: ursa-major
+Version: 0.1.1
+Release: 2%{?dist}
+Summary: A utility for working with module's koji tags in koji's tag inheritance
+
+Group: Development/Tools
+License: MIT
+URL: https://pagure.io/ursa-major
+Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
+
+BuildArch: noarch
+# libmodulemd is not available for ppc or i686
+ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+
+
+BuildRequires: help2man
+BuildRequires: libmodulemd
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-gobject-base
+BuildRequires: python3-cairo
+BuildRequires: python3-koji
+BuildRequires: python3-six
+BuildRequires: python3-requests
+BuildRequires: python3-jinja2
+BuildRequires: python3-psutil
+BuildRequires: python3-pytest
+BuildRequires: python3-mock
+%else
+BuildRequires: python2-devel
+BuildRequires: python2-koji
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires: python-setuptools
+BuildRequires: python-gobject-base
+BuildRequires: pycairo
+BuildRequires: python-six
+BuildRequires: python-requests
+BuildRequires: python-jinja2
+BuildRequires: python-futures
+BuildRequires: pytest
+BuildRequires: python-mock
+%else
+BuildRequires: python2-setuptools
+BuildRequires: python2-gobject-base
+BuildRequires: python2-cairo
+BuildRequires: python2-six
+BuildRequires: python2-requests
+BuildRequires: python2-jinja2
+BuildRequires: python2-futures
+BuildRequires: python2-pytest
+BuildRequires: python2-mock
+%endif
+%endif
+
+Requires: gobject-introspection
+Requires: krb5-workstation
+Requires: koji
+Requires: libmodulemd
+Requires: m2crypto
+
+%if 0%{?with_python3}
+Requires: python3-gobject-base
+Requires: python3-cairo
+Requires: python3-koji
+Requires: python3-six
+Requires: python3-requests
+Requires: python3-jinja2
+%else
+Requires: python2-koji
+%if 0%{?rhel} && 0%{?rhel} <= 7
+Requires: python-gobject-base
+Requires: pycairo
+Requires: python-six
+Requires: python-requests
+Requires: python-jinja2
+Requires: python-futures
+%else
+Requires: python2-gobject-base
+Requires: python2-cairo
+Requires: python2-six
+Requires: python2-requests
+Requires: python2-jinja2
+Requires: python2-futures
+%endif
+%endif
+
+
+%description
+Usra-Major can be used to edit a tag config file and update module's koji tags
+in koji's tag inheritance accordingly per the configuration in tag config file.
+
+
+%package -n ursa-major-stage
+Summary: A utility for working with module's koji tags in koji's tag inheritance
+Requires: %{name} = %{version}-%{release}
+
+%description -n ursa-major-stage
+The ursa-major-stage package contains script and configurations for Ursa-Major
+to talk with Fedora's stage instances (Koji, MBS).
+
+
+%prep
+%setup -q
+
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# workaround for no egg-info
+sed -i '/pycairo/d' requirements.txt
+# old setuptools not support environment marker
+sed -i 's/futures.*/futures/' requirements.txt
+%endif
+
+# workaround for no egg-info
+sed -i '/koji/d' requirements.txt
+
+%build
+%if 0%{?with_python3}
+%py3_build
+%else
+%py2_build
+%endif
+
+
+%install
+%if 0%{?with_python3}
+%py3_install
+%else
+%py2_install
+%endif
+
+%if 0%{?with_python3}
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+%else
+export PYTHONPATH=%{buildroot}%{python2_sitelib}
+%endif
+mkdir -p %{buildroot}/%{_mandir}/man1
+
+help2man -N --version-string=%{version} %{buildroot}/%{_bindir}/ursa-major > %{buildroot}/%{_mandir}/man1/ursa-major.1
+for cmd in show-config check-config remove-module add-module add-tag; do
+ help2man -N --version-string=%{version} "%{buildroot}/%{_bindir}/ursa-major $cmd" > %{buildroot}/%{_mandir}/man1/ursa-major-${cmd}.1
+done
+
+
+%check
+%if 0%{?with_python3}
+py.test-3
+%else
+py.test
+%endif
+
+
+%files
+%doc README.rst
+%license LICENSE
+
+%if 0%{?with_python3}
+%{python3_sitelib}/ursa_major*
+%else
+%{python2_sitelib}/ursa_major*
+%endif
+
+%{_bindir}/ursa-major
+%dir %{_sysconfdir}/ursa-major
+%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major.conf
+%doc %{_mandir}/man1/ursa-major*.1*
+
+%files stage
+%{_bindir}/ursa-major-stage
+%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major-stage.conf
+
+
+%changelog
+* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
+- Limit build arches as libmodulemd is not available for ppc or i686
+
+* Fri Oct 26 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-1
+- Initial version of spec file
5 years, 5 months