March 2019 - Arch-excludes - Fedora mailing-lists

Architecture specific change in rpms/eclipse-dtp.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/eclipse-dtp.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-dtp.git/commit/?id=2f496948…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit 2f4969483ff4dffc76453d414c517c5efbaf94b4 Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 14:06:47 2019 +0000 Update to 2019-03 release Restrict to same architectures as Eclipse itself Don't package aggregator poms diff --git a/.gitignore b/.gitignore index a07eeff..6fb85d4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /org.eclipse.datatools-64c74cb8e0d8c0880d818a0bc12c25f8e85b7302.tar.xz /org.eclipse.datatools-94b8f95c45d0d9e4444af2d9244a5fd065a469e3.tar.xz /org.eclipse.datatools-209258c8e9bf1b23d266aa518e47864250bb2bfe.tar.xz +/org.eclipse.datatools-0cdebb8165f564f4348fbed6b08c54427c77fdb9.tar.xz diff --git a/eclipse-dtp.spec b/eclipse-dtp.spec index 7a0563c..705ff26 100644 --- a/eclipse-dtp.spec +++ b/eclipse-dtp.spec @@ -1,17 +1,19 @@ -%global tag 209258c8e9bf1b23d266aa518e47864250bb2bfe +%global tag 0cdebb8165f564f4348fbed6b08c54427c77fdb9 Name: eclipse-dtp Version: 1.14.102 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Eclipse Data Tools Platform License: EPL-2.0 -URL: http://www.eclipse.org/datatools/ +URL: https://www.eclipse.org/datatools/ -Source0: http://git.eclipse.org/c/datatools/org.eclipse.datatools.git/snapshot/org.e… -Patch0: 0001-Add-treetableviewer-implementation.patch +Source0: https://git.eclipse.org/c/datatools/org.eclipse.datatools.git/snapshot/org.… BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: apache-commons-net @@ -36,14 +38,10 @@ data-centric technologies and supported by the DTP ecosystem. %prep %setup -q -n org.eclipse.datatools-%{tag} -%patch0 -p1 # Avoid using tycho-sourceref-jgit due to source tarball not being a git repo %pom_remove_plugin :tycho-packaging-plugin -# Relax lucene requirement -sed -i -e '/lucene/s/7\.5/7.1/' plugins/sqltools/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF - # Don't need to build tests or update site for RPM builds %pom_disable_module tests %pom_disable_module site @@ -54,6 +52,9 @@ sed -i -e '/lucene/s/7\.5/7.1/' plugins/sqltools/org.eclipse.datatools.sqltools. %pom_disable_module org.eclipse.datatools.enablement.oda.ecore.feature features %pom_disable_module org.eclipse.datatools.enablement.oda.ecore.sdk.feature features +# Don't package poms +%mvn_package "::pom::" __noinstall + %build %mvn_build -j @@ -63,6 +64,11 @@ sed -i -e '/lucene/s/7\.5/7.1/' plugins/sqltools/org.eclipse.datatools.sqltools. %files -f .mfiles %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 1.14.102-4 +- Update to 2019-03 release +- Restrict to same architectures as Eclipse itself +- Don't package aggregator poms + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.14.102-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 4e010cd..cac99f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.datatools-209258c8e9bf1b23d266aa518e47864250bb2bfe.tar.xz) = 5c5a7ac6cf147545a2b676332c43aae4678d1c2a2893ba756cd28c2030c32009f955ec59b32e623182dddf5008f03989b13e08dbd660b54ecd3142d68aaf2880 +SHA512 (org.eclipse.datatools-0cdebb8165f564f4348fbed6b08c54427c77fdb9.tar.xz) = bddb910f2dd05be117899acd32c445b8a3ca303dba71f02ebcd0e9f7f18f7c7734527ae6145141908aea02769fd9bbb20cf77e5a727de6871b3e41bc44ab14c0

1 0

Architecture specific change in rpms/eclipse-dltk.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/eclipse-dltk.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-dltk.git/commit/?id=e373b9a…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit e373b9ac8ed4b6eec5929c59d4e546495cd307ea Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 13:43:04 2019 +0000 Update to 2019-03 release Update license tag Restrict to same architectures as Eclipse itself diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec index 7b3ea3a..1fa0c3a 100644 --- a/eclipse-dltk.spec +++ b/eclipse-dltk.spec @@ -1,10 +1,10 @@ -%global gittag R5_10_0 +%global gittag R5_11_0 Name: eclipse-dltk -Version: 5.10.0 -Release: 2%{?dist} +Version: 5.11.0 +Release: 1%{?dist} Summary: Dynamic Languages Toolkit (DLTK) Eclipse plug-in -License: EPL-1.0 and (CPL or GPLv2+ or LGPLv2+) and Ruby and ASL 2.0 +License: EPL-2.0 and (CPL or GPLv2+ or LGPLv2+) and Ruby and ASL 2.0 URL: http://www.eclipse.org/dltk/ # source tarball and the script used to generate it from upstream's source control @@ -17,6 +17,9 @@ Patch0: use-import-package-for-javax.patch BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + BuildRequires: eclipse-license >= 1.0.1 BuildRequires: eclipse-pde >= 1:4.6.0 BuildRequires: eclipse-emf-runtime @@ -122,9 +125,10 @@ Tests for Eclipse Dynamic Languages Toolkit (DLTK). # It's not necessary to build an update site or p2 repo when using mvn_install %pom_disable_module build/update.site org.eclipse.dltk.releng -# org.mockito -> org.mockito.mockito-core -sed -i -e 's/org.mockito/org.mockito.mockito-core/' \ - org.eclipse.dltk.core/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF +# Allow greater range of Lucene versions +sed -i -e '/apache\.lucene/s/7\.6\.0/8.0.0/' \ + org.eclipse.dltk.core/core/plugins/org.eclipse.dltk.core.index.lucene/META-INF/MANIFEST.MF + # org.hamcrest -> org.hamcrest.core sed -i -e 's/org.hamcrest/org.hamcrest.core/' \ org.eclipse.dltk.core/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF @@ -161,27 +165,31 @@ QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +%Y%m%d%H%M) %mvn_install %files -f .mfiles-core -%doc org.eclipse.dltk.core/core/features/org.eclipse.dltk.core-feature/rootfiles/* +%license org.eclipse.dltk.core/LICENSE %files ruby -f .mfiles-ruby -%doc org.eclipse.dltk.ruby/features/org.eclipse.dltk.ruby-feature/rootfiles/* +%license org.eclipse.dltk.ruby/LICENSE %files tcl -f .mfiles-tcl -%doc org.eclipse.dltk.tcl/tcl/features/org.eclipse.dltk.tcl-feature/rootfiles/* +%license org.eclipse.dltk.tcl/LICENSE %files mylyn -f .mfiles-mylyn -%doc org.eclipse.dltk.core/mylyn/features/org.eclipse.dltk.mylyn-feature/rootfiles/* %files rse -f .mfiles-rse -%doc org.eclipse.dltk.core/rse/features/org.eclipse.dltk.rse-feature/rootfiles/* %files sh -f .mfiles-sh +%license org.eclipse.dltk.sh/LICENSE %files sdk -f .mfiles-sdk %files tests -f .mfiles-tests %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 5.11.0-1 +- Update to 2019-03 release +- Update license tag +- Restrict to same architectures as Eclipse itself + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/get-dltk.sh b/get-dltk.sh index d0b4bce..b8a6d04 100755 --- a/get-dltk.sh +++ b/get-dltk.sh @@ -2,19 +2,19 @@ set -e NAME="eclipse-dltk" -TAG=R5_10_0 -RELENG_TAG=4469ad28b3e6ea9aa94074b242b4c45f0cdd75d7 -CORE_TAG=1f1bf57e502f1c5177a05b993f5c1fd963a22f19 -RUBY_TAG=f97db2f53d5e2d46dae444e44e70eafa4b0475f9 -SHELL_TAG=4fa0de3a21c56bc2c60452e4bb2a19c96886678d -TCL_TAG=f0a789c268c48fc2964534e64683aced7b93cbda +TAG=R5_11_0 +RELENG_TAG=be159d20b068619a925f233d22c5371888088a23 +CORE_TAG=ff5ee79db0c2234347cb3f956de9b31047f43613 +RUBY_TAG=181ad1d6fe8cbec4ec61b7f2bb73542635f4369c +SHELL_TAG=6ac3a052181edc8d21cbdc2cbc090747feb6d348 +TCL_TAG=a1addff7c34a8a76bae515aa51564ea0b2e8b039 mkdir -p $NAME-$TAG pushd $NAME-$TAG function dl() { while [ ! -f "$1-$2.tar.xz" ] ; do - while ! wget http://git.eclipse.org/c/dltk/${1}.git/snapshot/${1}-${2}.tar.xz ; do + while ! wget https://git.eclipse.org/c/dltk/${1}.git/snapshot/${1}-${2}.tar.xz ; do sleep 1 done if ! tar xfs "$1-$2.tar.xz" ; then diff --git a/sources b/sources index 7d9b9fb..8f2b696 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (eclipse-dltk-R5_10_0.tar.xz) = fd29c529a5c1ba03ea62b208e1c4d36266ac115df7230b0fe8f075bbb2c123967662cbbd3b097e9f093d902678b949c559db6089456e49874ad13e55ebddc7c5 +SHA512 (eclipse-dltk-R5_11_0.tar.xz) = 33d2d67074b14744132c66740609c6142590dcb9e4346b8503693a71df3f31c517dd013bbdd660a0ff0920481a87ec2bd4ffe19bb0e7a8fe982c513e7f907372

1 0

Architecture specific change in rpms/eclipse-dltk.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/eclipse-dltk.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-dltk.git/commit/?id=e373b9a…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit e373b9ac8ed4b6eec5929c59d4e546495cd307ea Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 13:43:04 2019 +0000 Update to 2019-03 release Update license tag Restrict to same architectures as Eclipse itself diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec index 7b3ea3a..1fa0c3a 100644 --- a/eclipse-dltk.spec +++ b/eclipse-dltk.spec @@ -1,10 +1,10 @@ -%global gittag R5_10_0 +%global gittag R5_11_0 Name: eclipse-dltk -Version: 5.10.0 -Release: 2%{?dist} +Version: 5.11.0 +Release: 1%{?dist} Summary: Dynamic Languages Toolkit (DLTK) Eclipse plug-in -License: EPL-1.0 and (CPL or GPLv2+ or LGPLv2+) and Ruby and ASL 2.0 +License: EPL-2.0 and (CPL or GPLv2+ or LGPLv2+) and Ruby and ASL 2.0 URL: http://www.eclipse.org/dltk/ # source tarball and the script used to generate it from upstream's source control @@ -17,6 +17,9 @@ Patch0: use-import-package-for-javax.patch BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + BuildRequires: eclipse-license >= 1.0.1 BuildRequires: eclipse-pde >= 1:4.6.0 BuildRequires: eclipse-emf-runtime @@ -122,9 +125,10 @@ Tests for Eclipse Dynamic Languages Toolkit (DLTK). # It's not necessary to build an update site or p2 repo when using mvn_install %pom_disable_module build/update.site org.eclipse.dltk.releng -# org.mockito -> org.mockito.mockito-core -sed -i -e 's/org.mockito/org.mockito.mockito-core/' \ - org.eclipse.dltk.core/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF +# Allow greater range of Lucene versions +sed -i -e '/apache\.lucene/s/7\.6\.0/8.0.0/' \ + org.eclipse.dltk.core/core/plugins/org.eclipse.dltk.core.index.lucene/META-INF/MANIFEST.MF + # org.hamcrest -> org.hamcrest.core sed -i -e 's/org.hamcrest/org.hamcrest.core/' \ org.eclipse.dltk.core/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF @@ -161,27 +165,31 @@ QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +%Y%m%d%H%M) %mvn_install %files -f .mfiles-core -%doc org.eclipse.dltk.core/core/features/org.eclipse.dltk.core-feature/rootfiles/* +%license org.eclipse.dltk.core/LICENSE %files ruby -f .mfiles-ruby -%doc org.eclipse.dltk.ruby/features/org.eclipse.dltk.ruby-feature/rootfiles/* +%license org.eclipse.dltk.ruby/LICENSE %files tcl -f .mfiles-tcl -%doc org.eclipse.dltk.tcl/tcl/features/org.eclipse.dltk.tcl-feature/rootfiles/* +%license org.eclipse.dltk.tcl/LICENSE %files mylyn -f .mfiles-mylyn -%doc org.eclipse.dltk.core/mylyn/features/org.eclipse.dltk.mylyn-feature/rootfiles/* %files rse -f .mfiles-rse -%doc org.eclipse.dltk.core/rse/features/org.eclipse.dltk.rse-feature/rootfiles/* %files sh -f .mfiles-sh +%license org.eclipse.dltk.sh/LICENSE %files sdk -f .mfiles-sdk %files tests -f .mfiles-tests %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 5.11.0-1 +- Update to 2019-03 release +- Update license tag +- Restrict to same architectures as Eclipse itself + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/get-dltk.sh b/get-dltk.sh index d0b4bce..b8a6d04 100755 --- a/get-dltk.sh +++ b/get-dltk.sh @@ -2,19 +2,19 @@ set -e NAME="eclipse-dltk" -TAG=R5_10_0 -RELENG_TAG=4469ad28b3e6ea9aa94074b242b4c45f0cdd75d7 -CORE_TAG=1f1bf57e502f1c5177a05b993f5c1fd963a22f19 -RUBY_TAG=f97db2f53d5e2d46dae444e44e70eafa4b0475f9 -SHELL_TAG=4fa0de3a21c56bc2c60452e4bb2a19c96886678d -TCL_TAG=f0a789c268c48fc2964534e64683aced7b93cbda +TAG=R5_11_0 +RELENG_TAG=be159d20b068619a925f233d22c5371888088a23 +CORE_TAG=ff5ee79db0c2234347cb3f956de9b31047f43613 +RUBY_TAG=181ad1d6fe8cbec4ec61b7f2bb73542635f4369c +SHELL_TAG=6ac3a052181edc8d21cbdc2cbc090747feb6d348 +TCL_TAG=a1addff7c34a8a76bae515aa51564ea0b2e8b039 mkdir -p $NAME-$TAG pushd $NAME-$TAG function dl() { while [ ! -f "$1-$2.tar.xz" ] ; do - while ! wget http://git.eclipse.org/c/dltk/${1}.git/snapshot/${1}-${2}.tar.xz ; do + while ! wget https://git.eclipse.org/c/dltk/${1}.git/snapshot/${1}-${2}.tar.xz ; do sleep 1 done if ! tar xfs "$1-$2.tar.xz" ; then diff --git a/sources b/sources index 7d9b9fb..8f2b696 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (eclipse-dltk-R5_10_0.tar.xz) = fd29c529a5c1ba03ea62b208e1c4d36266ac115df7230b0fe8f075bbb2c123967662cbbd3b097e9f093d902678b949c559db6089456e49874ad13e55ebddc7c5 +SHA512 (eclipse-dltk-R5_11_0.tar.xz) = 33d2d67074b14744132c66740609c6142590dcb9e4346b8503693a71df3f31c517dd013bbdd660a0ff0920481a87ec2bd4ffe19bb0e7a8fe982c513e7f907372

1 0

Architecture specific change in rpms/gcc.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/gcc.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/gcc.git/commit/?id=4d0e748417069443…. Change: +%ifarch x86_64 ppc64 ppc64p7 Thanks. Full change: ============ commit 4d0e748417069443292cecced8e96de38a097333 Author: Jakub Jelinek <jakub(a)redhat.com> Date: Thu Mar 14 13:17:36 2019 +0100 Resolves: #1688766 diff --git a/gcc.spec b/gcc.spec index 874faad..7d49003 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1266,36 +1266,39 @@ mkdir -p %{buildroot}/%{_lib} mv -f %{buildroot}%{_prefix}/%{_lib}/libgcc_s.so.1 %{buildroot}/%{_lib}/libgcc_s-%{gcc_major}-%{DATE}.so.1 chmod 755 %{buildroot}/%{_lib}/libgcc_s-%{gcc_major}-%{DATE}.so.1 ln -sf libgcc_s-%{gcc_major}-%{DATE}.so.1 %{buildroot}/%{_lib}/libgcc_s.so.1 -ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so -%ifarch sparcv9 ppc -ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64/libgcc_s.so -%endif -%ifarch %{multilib_64_archs} -ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so -%endif -%ifarch ppc +%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 ppc64le %{arm} rm -f $FULLPATH/libgcc_s.so echo '/* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ -OUTPUT_FORMAT(elf32-powerpc) -GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so +OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`') +GROUP ( /%{_lib}/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so +%else +ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so %endif -%ifarch ppc64 ppc64p7 -rm -f $FULLPATH/32/libgcc_s.so +%ifarch sparcv9 ppc +%ifarch ppc +rm -f $FULLPATH/64/libgcc_s.so echo '/* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ -OUTPUT_FORMAT(elf32-powerpc) -GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/32/libgcc_s.so +OUTPUT_FORMAT('`gcc -m64 -Wl,--print-output-format -nostdlib -r -o /dev/null`') +GROUP ( /lib64/libgcc_s.so.1 libgcc.a )' > $FULLPATH/64/libgcc_s.so +%else +ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64/libgcc_s.so %endif -%ifarch %{arm} -rm -f $FULLPATH/libgcc_s.so +%endif +%ifarch %{multilib_64_archs} +%ifarch x86_64 ppc64 ppc64p7 +rm -f $FULLPATH/64/libgcc_s.so echo '/* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ -OUTPUT_FORMAT(elf32-littlearm) -GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so +OUTPUT_FORMAT('`gcc -m32 -Wl,--print-output-format -nostdlib -r -o /dev/null`') +GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/32/libgcc_s.so +%else +ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so +%endif %endif mv -f %{buildroot}%{_prefix}/%{_lib}/libgomp.spec $FULLPATH/ @@ -2958,6 +2961,10 @@ end %endif %changelog +% Thu Mar 14 2019 Jakub Jelinek <jakub(a)redhat.com> 9.0.1-0.11 +- turn libgcc_s.so into a linker script on i?86, x86_64, ppc64le and also on + ppc and ppc64 for 64-bit multilib (#1688766) + * Tue Mar 12 2019 Jakub Jelinek <jakub(a)redhat.com> 9.0.1-0.10 - update from trunk - PRs bootstrap/89656, c++/70349, c++/86521, c++/87571, c++/87750,

1 0

Architecture specific change in rpms/eclipse-linuxtools.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/eclipse-linuxtools.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-linuxtools.git/commit/?id=7…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit 758ff8ffc89d3fe439a4c80a3d231206d0f44091 Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 11:50:01 2019 +0000 Update to 2019-03 release Restrict to same architectures as Eclipse itself diff --git a/0001-Use-local-libhover-data.patch b/0001-Use-local-libhover-data.patch new file mode 100644 index 0000000..8021ab8 --- /dev/null +++ b/0001-Use-local-libhover-data.patch @@ -0,0 +1,38 @@ +From 52ea6767b31f74e607eb80ed777d5c6328f4bfcd Mon Sep 17 00:00:00 2001 +From: Mat Booth <mat.booth(a)redhat.com> +Date: Thu, 14 Mar 2019 11:31:34 +0000 +Subject: [PATCH 1/3] Use local libhover data + +--- + .../build.properties | 1 + + .../org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties +index b901542..6f62a0d 100644 +--- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties ++++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties +@@ -4,6 +4,7 @@ bin.includes = META-INF/,\ + plugin.xml,\ + toc.xml,\ + about.html,\ ++ data,\ + plugin.properties + src.includes = about.html,\ + src/ +diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml +index 38a5b81..89c9a51 100644 +--- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml ++++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml +@@ -7,7 +7,7 @@ + point="org.eclipse.linuxtools.cdt.libhover.library"> + <library + docs="https://gcc.gnu.org/onlinedocs/libstdc++/manual/index.html" +- location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover" ++ location="./data/libstdc++-v3.libhover" + name="libstdc++ library" + type="C++"> + </library> +-- +2.20.1 + diff --git a/0002-Fix-Docker-Tooling-terminal-on-newer-versions-of-Jer.patch b/0002-Fix-Docker-Tooling-terminal-on-newer-versions-of-Jer.patch new file mode 100644 index 0000000..cecc6bf --- /dev/null +++ b/0002-Fix-Docker-Tooling-terminal-on-newer-versions-of-Jer.patch @@ -0,0 +1,32 @@ +From 8d26bfe92908dec044635e59a40ce43fd4213552 Mon Sep 17 00:00:00 2001 +From: Mat Booth <mat.booth(a)redhat.com> +Date: Thu, 14 Mar 2019 11:32:07 +0000 +Subject: [PATCH 2/3] Fix Docker Tooling terminal on newer versions of Jersey + +--- + .../linuxtools/internal/docker/core/HttpHijackWorkaround.java | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java +index e163ca8..045419b 100644 +--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java ++++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java +@@ -49,6 +49,7 @@ public class HttpHijackWorkaround { + "input", //$NON-NLS-1$ + "in", //$NON-NLS-1$ + "in", //$NON-NLS-1$ ++ "in", //$NON-NLS-1$ + "wrappedStream", //$NON-NLS-1$ + "in", //$NON-NLS-1$ + "instream" //$NON-NLS-1$ +@@ -60,6 +61,7 @@ public class HttpHijackWorkaround { + "org.glassfish.jersey.message.internal.EntityInputStream", //$NON-NLS-1$ + FilterInputStream.class.getName(), + FilterInputStream.class.getName(), ++ FilterInputStream.class.getName(), + "org.apache.http.conn.EofSensorInputStream", //$NON-NLS-1$ + "org.apache.http.impl.io.IdentityInputStream", //$NON-NLS-1$ + "org.apache.http.impl.io.SessionInputBufferImpl" }; //$NON-NLS-1$ +-- +2.20.1 + diff --git a/0003-Use-import-package-for-javax.xml.bind.patch b/0003-Use-import-package-for-javax.xml.bind.patch new file mode 100644 index 0000000..d61282a --- /dev/null +++ b/0003-Use-import-package-for-javax.xml.bind.patch @@ -0,0 +1,64 @@ +From b9df9b3f38920e03ce1d82d24ad21ad214916b7e Mon Sep 17 00:00:00 2001 +From: Mat Booth <mat.booth(a)redhat.com> +Date: Thu, 14 Mar 2019 11:34:14 +0000 +Subject: [PATCH 3/3] Use import package for javax.xml.bind + +--- + .../org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF | 6 +++--- + .../org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF | 4 ++-- + .../META-INF/MANIFEST.MF | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF +index f5f49f8..ab7d5fe 100644 +--- a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF ++++ b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF +@@ -18,14 +18,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", + org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.14.0", + org.glassfish.jersey.core.jersey-common;bundle-version="2.14.0", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", +- org.eclipse.debug.core;bundle-version="3.10.100", +- javax.xml.bind;bundle-version="2.2.0", +- javax.xml.stream;bundle-version="1.0.1" ++ org.eclipse.debug.core;bundle-version="3.10.100" + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Bundle-ActivationPolicy: lazy + Export-Package: org.eclipse.linuxtools.docker.core, + org.eclipse.linuxtools.internal.docker.core;x-friends:="org.eclipse.linuxtools.docker.ui,org.eclipse.linuxtools.docker.ui.tests,org.eclipse.linuxtools.docker.integration.tests" + Import-Package: com.fasterxml.jackson.annotation;version="2.5.0", ++ javax.xml.bind, ++ javax.xml.stream, + javax.ws.rs;version="2.0.1", + javax.ws.rs.core;version="2.0.1", + javax.ws.rs.client;version="2.0.1" +diff --git a/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF +index 0d235c9..352984e 100644 +--- a/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF ++++ b/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF +@@ -30,8 +30,8 @@ Require-Bundle: org.eclipse.ui, + org.eclipse.tm.terminal.view.ui;bundle-version="4.1.0", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", + com.ibm.icu, +- org.apache.commons.compress;bundle-version="1.6.0", +- javax.xml.bind;bundle-version="2.2.0" ++ org.apache.commons.compress;bundle-version="1.6.0" ++Import-Package: javax.xml.bind + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Bundle-ActivationPolicy: lazy + Bundle-Localization: plugin +diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF +index 49dc178..94f533e 100644 +--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF ++++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF +@@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.debug.core, + org.eclipse.linuxtools.docker.ui, + org.eclipse.linuxtools.docker.core, + com.spotify.docker.client, +- org.eclipse.core.runtime, +- javax.xml.bind;bundle-version="2.2.0" ++ org.eclipse.core.runtime ++Import-Package: javax.xml.bind + Automatic-Module-Name: org.eclipse.linuxtools.jdt.docker.launcher +-- +2.20.1 + diff --git a/eclipse-libhover-local-libstdcxx.patch b/eclipse-libhover-local-libstdcxx.patch deleted file mode 100644 index 2aaa0a9..0000000 --- a/eclipse-libhover-local-libstdcxx.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties -index b901542..6f62a0d 100644 ---- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties -+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties -@@ -4,6 +4,7 @@ - plugin.xml,\ - toc.xml,\ - about.html,\ -+ data,\ - plugin.properties - src.includes = about.html,\ - src/ -diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml -index 38a5b81..89c9a51 100644 ---- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml -+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml -@@ -7,7 +7,7 @@ - point="org.eclipse.linuxtools.cdt.libhover.library"> - <library - docs="https://gcc.gnu.org/onlinedocs/libstdc++/manual/index.html" -- location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover" -+ location="./data/libstdc++-v3.libhover" - name="libstdc++ library" - type="C++"> - </library> - diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec index 768dbb5..08c5991 100644 --- a/eclipse-linuxtools.spec +++ b/eclipse-linuxtools.spec @@ -1,8 +1,8 @@ -%global git_tag aa54a840151c6b03e22bb9eccb3c8a9de5a1b461 +%global git_tag 7.2.0 Name: eclipse-linuxtools -Version: 7.1.0 -Release: 3%{?dist} +Version: 7.2.0 +Release: 1%{?dist} Summary: Linux specific Eclipse plugins License: EPL-2.0 @@ -10,9 +10,9 @@ URL: http://eclipse.org/linuxtools/ Source0: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org… Source1: libstdc++-v3.libhover -Patch0: eclipse-libhover-local-libstdcxx.patch -Patch1: fix-jgit-issue.patch -Patch2: fix-terminal-on-newer-jersey.patch +Patch0: 0001-Use-local-libhover-data.patch +Patch1: 0002-Fix-Docker-Tooling-terminal-on-newer-versions-of-Jer.patch +Patch2: 0003-Use-import-package-for-javax.xml.bind.patch BuildRequires: tycho BuildRequires: tycho-extras @@ -27,8 +27,7 @@ BuildRequires: eclipse-mylyn BuildRequires: exec-maven-plugin BuildRequires: eclipse-ptp BuildRequires: nekohtml -BuildRequires: tiger-types -BuildRequires: docker-client-java >= 8.11.7-1 +BuildRequires: docker-client-java >= 8.11.7-4 BuildRequires: glassfish-jax-rs-api BuildRequires: glassfish-jaxb-api BuildRequires: assertj-core @@ -41,6 +40,9 @@ Requires: glassfish-annotation-api BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + %description The Linux Tools project is a two-faceted project. Firstly, it develops tools and frameworks for writing tools for Linux developers. Secondly, it provides @@ -88,8 +90,7 @@ fetching its content for embedded display purposes (e.g hover help). %package docker Summary: Docker Tooling -Requires: tiger-types -Requires: docker-client-java >= 8.11.7-1 +Requires: docker-client-java >= 8.11.7-4 # Ensure we have latest security fixes Requires: bouncycastle >= 1.61 Requires: jackson-databind >= 2.9.8 @@ -214,14 +215,13 @@ mkdir data cp %{SOURCE1} data/. popd +# Not needed for RPM builds %pom_remove_plugin org.jacoco:jacoco-maven-plugin +%pom_remove_dep :tycho-sourceref-jgit vagrant containers +%pom_xpath_remove 'pom:configuration/pom:sourceReferences' vagrant containers # org.assertj -> org.assertj.core -# org.mockito -> org.mockito.mockito-core sed -i -e 's/org.assertj/org.assertj.core/' containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF -%if 0%{?fedora} && 0%{?fedora} < 30 -sed -i -e 's/org.mockito/org.mockito.mockito-core/' valgrind/org.eclipse.linuxtools.valgrind.core.tests/META-INF/MANIFEST.MF -%endif # Reddeer is not available %pom_disable_module org.eclipse.linuxtools.docker.reddeer containers @@ -238,19 +238,10 @@ sed -i '/<target>/,/<\/target>/ d' pom.xml sed -i -e '9i\ javax.annotation-api;bundle-version="1.2.0",' \ containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF -# Fix javax.xml deps -sed -i -e '/javax\.xml\./d' -e '/Import-Package/a\ javax.xml.bind,' -e '/org.eclipse.debug.core/s/,//' \ -containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF - # Relax restriction on guava sed -i -e '/com.google.guava/s/guava$;bundle-version=\".*\"$\?/guava;bundle-version=\"[18.0.0,21.0.0)\"/' \ - mylyn/org.eclipse.linuxtools.mylyn.osio.rest.{ui,core,core.tests}/META-INF/MANIFEST.MF \ containers/org.eclipse.linuxtools.docker.{core,ui.tests,integration.tests}/META-INF/MANIFEST.MF -# Relax restriction on gson -sed -i -e '/com.google.gson/s/2.7.0/2.3.1/' \ - mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/META-INF/MANIFEST.MF - %mvn_package "::pom::" __noinstall %mvn_package ":*.{test,tests}" linuxtools-tests %mvn_package ":*.tests.hamcrest-wrap" linuxtools-tests @@ -281,6 +272,7 @@ for p in changelog gcov gprof oprofile perf systemtap valgrind ; do done %files -f .mfiles-core +%doc README.md %files changelog -f .mfiles-changelog %{_datadir}/appdata/eclipse-changelog.metainfo.xml @@ -318,6 +310,10 @@ done %files tests -f .mfiles-linuxtools-tests %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 7.2.0-1 +- Update to 2019-03 release +- Restrict to same architectures as Eclipse itself + * Thu Feb 07 2019 Mat Booth <mat.booth(a)redhat.com> - 7.1.0-3 - Rebuild against newer BC and Jackson diff --git a/fix-jgit-issue.patch b/fix-jgit-issue.patch deleted file mode 100644 index 45e3ec0..0000000 --- a/fix-jgit-issue.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/containers/pom.xml -+++ b/containers/pom.xml -@@ -44,9 +44,9 @@ - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> -- <sourceReferences> -+  - <archiveSite>true</archiveSite> - <environments> - <environment> -@@ -76,13 +76,13 @@ - </environment> - </environments> - </configuration> -- <dependencies> -+  - </plugin> - - <plugin> - ---- a/vagrant/pom.xml -+++ b/vagrant/pom.xml -@@ -36,9 +36,9 @@ - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> -- <sourceReferences> -+  - <archiveSite>true</archiveSite> - <environments> - <environment> -@@ -69,11 +69,11 @@ - </environments> - </configuration> - <dependencies> -- <dependency> -+  - </dependencies> - </plugin> - ---- a/mylyn/pom.xml -+++ b/mylyn/pom.xml -@@ -35,9 +35,9 @@ - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> -- <sourceReferences> -+  - <archiveSite>true</archiveSite> - <environments> - <environment> -@@ -68,11 +68,11 @@ - </environments> - </configuration> - <dependencies> -- <dependency> -+  - </dependencies> - </plugin> - diff --git a/fix-terminal-on-newer-jersey.patch b/fix-terminal-on-newer-jersey.patch deleted file mode 100644 index 81f97b1..0000000 --- a/fix-terminal-on-newer-jersey.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b2921f1d0f59287a9609560d3b005b859ddc4af2 Mon Sep 17 00:00:00 2001 -From: Roland Grunberg <rgrunber(a)redhat.com> -Date: Wed, 7 Sep 2016 15:21:25 -0400 -Subject: [PATCH] Retrieve the underlying InputStream on newer versions of - Jersey. - -The underlying input stream, that supports writing seems to be nested -under an additional layer. This likely happened due to some upstream -change between Jersey 2.18 and 2.22.2. - -Change-Id: I549061ec63054836f563a49b22b5df891015bf63 ---- - .../eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java -index ffe2169..441e7b4 100644 ---- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java -+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java -@@ -49,6 +49,7 @@ public class HttpHijackWorkaround { - "input", //$NON-NLS-1$ - "in", //$NON-NLS-1$ - "in", //$NON-NLS-1$ -+ "in", //$NON-NLS-1$ - "wrappedStream", //$NON-NLS-1$ - "in", //$NON-NLS-1$ - "instream" //$NON-NLS-1$ -@@ -60,6 +61,7 @@ public class HttpHijackWorkaround { - "org.glassfish.jersey.message.internal.EntityInputStream", //$NON-NLS-1$ - FilterInputStream.class.getName(), - FilterInputStream.class.getName(), -+ FilterInputStream.class.getName(), - "org.apache.http.conn.EofSensorInputStream", //$NON-NLS-1$ - "org.apache.http.impl.io.IdentityInputStream", //$NON-NLS-1$ - "org.apache.http.impl.io.SessionInputBufferImpl" }; //$NON-NLS-1$ --- -2.7.4 - diff --git a/sources b/sources index e08f4ea..f399853 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.linuxtools-aa54a840151c6b03e22bb9eccb3c8a9de5a1b461.tar.xz) = 385c1bb2f30f8fb85ee9b0aa504a05334e346b2caede1f0ffaf39d87886130878df1e9c50112d9ce6ed9970e7c3a8e9889399725f47ff4806eaf5603194f664c +SHA512 (org.eclipse.linuxtools-7.2.0.tar.xz) = 994754bd2a69526404be2d82bf43102d867e7f8ab753385412d2204fbcca0db559a7b26d9431d04d1809244e6520aeb04dfaf65b45e2dd4e7fe789e9021b9e46

1 0

Architecture specific change in rpms/eclipse-linuxtools.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/eclipse-linuxtools.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-linuxtools.git/commit/?id=7…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit 758ff8ffc89d3fe439a4c80a3d231206d0f44091 Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 11:50:01 2019 +0000 Update to 2019-03 release Restrict to same architectures as Eclipse itself diff --git a/0001-Use-local-libhover-data.patch b/0001-Use-local-libhover-data.patch new file mode 100644 index 0000000..8021ab8 --- /dev/null +++ b/0001-Use-local-libhover-data.patch @@ -0,0 +1,38 @@ +From 52ea6767b31f74e607eb80ed777d5c6328f4bfcd Mon Sep 17 00:00:00 2001 +From: Mat Booth <mat.booth(a)redhat.com> +Date: Thu, 14 Mar 2019 11:31:34 +0000 +Subject: [PATCH 1/3] Use local libhover data + +--- + .../build.properties | 1 + + .../org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties +index b901542..6f62a0d 100644 +--- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties ++++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties +@@ -4,6 +4,7 @@ bin.includes = META-INF/,\ + plugin.xml,\ + toc.xml,\ + about.html,\ ++ data,\ + plugin.properties + src.includes = about.html,\ + src/ +diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml +index 38a5b81..89c9a51 100644 +--- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml ++++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml +@@ -7,7 +7,7 @@ + point="org.eclipse.linuxtools.cdt.libhover.library"> + <library + docs="https://gcc.gnu.org/onlinedocs/libstdc++/manual/index.html" +- location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover" ++ location="./data/libstdc++-v3.libhover" + name="libstdc++ library" + type="C++"> + </library> +-- +2.20.1 + diff --git a/0002-Fix-Docker-Tooling-terminal-on-newer-versions-of-Jer.patch b/0002-Fix-Docker-Tooling-terminal-on-newer-versions-of-Jer.patch new file mode 100644 index 0000000..cecc6bf --- /dev/null +++ b/0002-Fix-Docker-Tooling-terminal-on-newer-versions-of-Jer.patch @@ -0,0 +1,32 @@ +From 8d26bfe92908dec044635e59a40ce43fd4213552 Mon Sep 17 00:00:00 2001 +From: Mat Booth <mat.booth(a)redhat.com> +Date: Thu, 14 Mar 2019 11:32:07 +0000 +Subject: [PATCH 2/3] Fix Docker Tooling terminal on newer versions of Jersey + +--- + .../linuxtools/internal/docker/core/HttpHijackWorkaround.java | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java +index e163ca8..045419b 100644 +--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java ++++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java +@@ -49,6 +49,7 @@ public class HttpHijackWorkaround { + "input", //$NON-NLS-1$ + "in", //$NON-NLS-1$ + "in", //$NON-NLS-1$ ++ "in", //$NON-NLS-1$ + "wrappedStream", //$NON-NLS-1$ + "in", //$NON-NLS-1$ + "instream" //$NON-NLS-1$ +@@ -60,6 +61,7 @@ public class HttpHijackWorkaround { + "org.glassfish.jersey.message.internal.EntityInputStream", //$NON-NLS-1$ + FilterInputStream.class.getName(), + FilterInputStream.class.getName(), ++ FilterInputStream.class.getName(), + "org.apache.http.conn.EofSensorInputStream", //$NON-NLS-1$ + "org.apache.http.impl.io.IdentityInputStream", //$NON-NLS-1$ + "org.apache.http.impl.io.SessionInputBufferImpl" }; //$NON-NLS-1$ +-- +2.20.1 + diff --git a/0003-Use-import-package-for-javax.xml.bind.patch b/0003-Use-import-package-for-javax.xml.bind.patch new file mode 100644 index 0000000..d61282a --- /dev/null +++ b/0003-Use-import-package-for-javax.xml.bind.patch @@ -0,0 +1,64 @@ +From b9df9b3f38920e03ce1d82d24ad21ad214916b7e Mon Sep 17 00:00:00 2001 +From: Mat Booth <mat.booth(a)redhat.com> +Date: Thu, 14 Mar 2019 11:34:14 +0000 +Subject: [PATCH 3/3] Use import package for javax.xml.bind + +--- + .../org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF | 6 +++--- + .../org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF | 4 ++-- + .../META-INF/MANIFEST.MF | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF +index f5f49f8..ab7d5fe 100644 +--- a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF ++++ b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF +@@ -18,14 +18,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", + org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.14.0", + org.glassfish.jersey.core.jersey-common;bundle-version="2.14.0", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", +- org.eclipse.debug.core;bundle-version="3.10.100", +- javax.xml.bind;bundle-version="2.2.0", +- javax.xml.stream;bundle-version="1.0.1" ++ org.eclipse.debug.core;bundle-version="3.10.100" + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Bundle-ActivationPolicy: lazy + Export-Package: org.eclipse.linuxtools.docker.core, + org.eclipse.linuxtools.internal.docker.core;x-friends:="org.eclipse.linuxtools.docker.ui,org.eclipse.linuxtools.docker.ui.tests,org.eclipse.linuxtools.docker.integration.tests" + Import-Package: com.fasterxml.jackson.annotation;version="2.5.0", ++ javax.xml.bind, ++ javax.xml.stream, + javax.ws.rs;version="2.0.1", + javax.ws.rs.core;version="2.0.1", + javax.ws.rs.client;version="2.0.1" +diff --git a/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF +index 0d235c9..352984e 100644 +--- a/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF ++++ b/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF +@@ -30,8 +30,8 @@ Require-Bundle: org.eclipse.ui, + org.eclipse.tm.terminal.view.ui;bundle-version="4.1.0", + org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", + com.ibm.icu, +- org.apache.commons.compress;bundle-version="1.6.0", +- javax.xml.bind;bundle-version="2.2.0" ++ org.apache.commons.compress;bundle-version="1.6.0" ++Import-Package: javax.xml.bind + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Bundle-ActivationPolicy: lazy + Bundle-Localization: plugin +diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF +index 49dc178..94f533e 100644 +--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF ++++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF +@@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.debug.core, + org.eclipse.linuxtools.docker.ui, + org.eclipse.linuxtools.docker.core, + com.spotify.docker.client, +- org.eclipse.core.runtime, +- javax.xml.bind;bundle-version="2.2.0" ++ org.eclipse.core.runtime ++Import-Package: javax.xml.bind + Automatic-Module-Name: org.eclipse.linuxtools.jdt.docker.launcher +-- +2.20.1 + diff --git a/eclipse-libhover-local-libstdcxx.patch b/eclipse-libhover-local-libstdcxx.patch deleted file mode 100644 index 2aaa0a9..0000000 --- a/eclipse-libhover-local-libstdcxx.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties -index b901542..6f62a0d 100644 ---- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties -+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties -@@ -4,6 +4,7 @@ - plugin.xml,\ - toc.xml,\ - about.html,\ -+ data,\ - plugin.properties - src.includes = about.html,\ - src/ -diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml -index 38a5b81..89c9a51 100644 ---- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml -+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml -@@ -7,7 +7,7 @@ - point="org.eclipse.linuxtools.cdt.libhover.library"> - <library - docs="https://gcc.gnu.org/onlinedocs/libstdc++/manual/index.html" -- location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover" -+ location="./data/libstdc++-v3.libhover" - name="libstdc++ library" - type="C++"> - </library> - diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec index 768dbb5..08c5991 100644 --- a/eclipse-linuxtools.spec +++ b/eclipse-linuxtools.spec @@ -1,8 +1,8 @@ -%global git_tag aa54a840151c6b03e22bb9eccb3c8a9de5a1b461 +%global git_tag 7.2.0 Name: eclipse-linuxtools -Version: 7.1.0 -Release: 3%{?dist} +Version: 7.2.0 +Release: 1%{?dist} Summary: Linux specific Eclipse plugins License: EPL-2.0 @@ -10,9 +10,9 @@ URL: http://eclipse.org/linuxtools/ Source0: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org… Source1: libstdc++-v3.libhover -Patch0: eclipse-libhover-local-libstdcxx.patch -Patch1: fix-jgit-issue.patch -Patch2: fix-terminal-on-newer-jersey.patch +Patch0: 0001-Use-local-libhover-data.patch +Patch1: 0002-Fix-Docker-Tooling-terminal-on-newer-versions-of-Jer.patch +Patch2: 0003-Use-import-package-for-javax.xml.bind.patch BuildRequires: tycho BuildRequires: tycho-extras @@ -27,8 +27,7 @@ BuildRequires: eclipse-mylyn BuildRequires: exec-maven-plugin BuildRequires: eclipse-ptp BuildRequires: nekohtml -BuildRequires: tiger-types -BuildRequires: docker-client-java >= 8.11.7-1 +BuildRequires: docker-client-java >= 8.11.7-4 BuildRequires: glassfish-jax-rs-api BuildRequires: glassfish-jaxb-api BuildRequires: assertj-core @@ -41,6 +40,9 @@ Requires: glassfish-annotation-api BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + %description The Linux Tools project is a two-faceted project. Firstly, it develops tools and frameworks for writing tools for Linux developers. Secondly, it provides @@ -88,8 +90,7 @@ fetching its content for embedded display purposes (e.g hover help). %package docker Summary: Docker Tooling -Requires: tiger-types -Requires: docker-client-java >= 8.11.7-1 +Requires: docker-client-java >= 8.11.7-4 # Ensure we have latest security fixes Requires: bouncycastle >= 1.61 Requires: jackson-databind >= 2.9.8 @@ -214,14 +215,13 @@ mkdir data cp %{SOURCE1} data/. popd +# Not needed for RPM builds %pom_remove_plugin org.jacoco:jacoco-maven-plugin +%pom_remove_dep :tycho-sourceref-jgit vagrant containers +%pom_xpath_remove 'pom:configuration/pom:sourceReferences' vagrant containers # org.assertj -> org.assertj.core -# org.mockito -> org.mockito.mockito-core sed -i -e 's/org.assertj/org.assertj.core/' containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF -%if 0%{?fedora} && 0%{?fedora} < 30 -sed -i -e 's/org.mockito/org.mockito.mockito-core/' valgrind/org.eclipse.linuxtools.valgrind.core.tests/META-INF/MANIFEST.MF -%endif # Reddeer is not available %pom_disable_module org.eclipse.linuxtools.docker.reddeer containers @@ -238,19 +238,10 @@ sed -i '/<target>/,/<\/target>/ d' pom.xml sed -i -e '9i\ javax.annotation-api;bundle-version="1.2.0",' \ containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF -# Fix javax.xml deps -sed -i -e '/javax\.xml\./d' -e '/Import-Package/a\ javax.xml.bind,' -e '/org.eclipse.debug.core/s/,//' \ -containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF - # Relax restriction on guava sed -i -e '/com.google.guava/s/guava$;bundle-version=\".*\"$\?/guava;bundle-version=\"[18.0.0,21.0.0)\"/' \ - mylyn/org.eclipse.linuxtools.mylyn.osio.rest.{ui,core,core.tests}/META-INF/MANIFEST.MF \ containers/org.eclipse.linuxtools.docker.{core,ui.tests,integration.tests}/META-INF/MANIFEST.MF -# Relax restriction on gson -sed -i -e '/com.google.gson/s/2.7.0/2.3.1/' \ - mylyn/org.eclipse.linuxtools.mylyn.osio.rest.core/META-INF/MANIFEST.MF - %mvn_package "::pom::" __noinstall %mvn_package ":*.{test,tests}" linuxtools-tests %mvn_package ":*.tests.hamcrest-wrap" linuxtools-tests @@ -281,6 +272,7 @@ for p in changelog gcov gprof oprofile perf systemtap valgrind ; do done %files -f .mfiles-core +%doc README.md %files changelog -f .mfiles-changelog %{_datadir}/appdata/eclipse-changelog.metainfo.xml @@ -318,6 +310,10 @@ done %files tests -f .mfiles-linuxtools-tests %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 7.2.0-1 +- Update to 2019-03 release +- Restrict to same architectures as Eclipse itself + * Thu Feb 07 2019 Mat Booth <mat.booth(a)redhat.com> - 7.1.0-3 - Rebuild against newer BC and Jackson diff --git a/fix-jgit-issue.patch b/fix-jgit-issue.patch deleted file mode 100644 index 45e3ec0..0000000 --- a/fix-jgit-issue.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/containers/pom.xml -+++ b/containers/pom.xml -@@ -44,9 +44,9 @@ - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> -- <sourceReferences> -+  - <archiveSite>true</archiveSite> - <environments> - <environment> -@@ -76,13 +76,13 @@ - </environment> - </environments> - </configuration> -- <dependencies> -+  - </plugin> - - <plugin> - ---- a/vagrant/pom.xml -+++ b/vagrant/pom.xml -@@ -36,9 +36,9 @@ - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> -- <sourceReferences> -+  - <archiveSite>true</archiveSite> - <environments> - <environment> -@@ -69,11 +69,11 @@ - </environments> - </configuration> - <dependencies> -- <dependency> -+  - </dependencies> - </plugin> - ---- a/mylyn/pom.xml -+++ b/mylyn/pom.xml -@@ -35,9 +35,9 @@ - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> -- <sourceReferences> -+  - <archiveSite>true</archiveSite> - <environments> - <environment> -@@ -68,11 +68,11 @@ - </environments> - </configuration> - <dependencies> -- <dependency> -+  - </dependencies> - </plugin> - diff --git a/fix-terminal-on-newer-jersey.patch b/fix-terminal-on-newer-jersey.patch deleted file mode 100644 index 81f97b1..0000000 --- a/fix-terminal-on-newer-jersey.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b2921f1d0f59287a9609560d3b005b859ddc4af2 Mon Sep 17 00:00:00 2001 -From: Roland Grunberg <rgrunber(a)redhat.com> -Date: Wed, 7 Sep 2016 15:21:25 -0400 -Subject: [PATCH] Retrieve the underlying InputStream on newer versions of - Jersey. - -The underlying input stream, that supports writing seems to be nested -under an additional layer. This likely happened due to some upstream -change between Jersey 2.18 and 2.22.2. - -Change-Id: I549061ec63054836f563a49b22b5df891015bf63 ---- - .../eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java -index ffe2169..441e7b4 100644 ---- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java -+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java -@@ -49,6 +49,7 @@ public class HttpHijackWorkaround { - "input", //$NON-NLS-1$ - "in", //$NON-NLS-1$ - "in", //$NON-NLS-1$ -+ "in", //$NON-NLS-1$ - "wrappedStream", //$NON-NLS-1$ - "in", //$NON-NLS-1$ - "instream" //$NON-NLS-1$ -@@ -60,6 +61,7 @@ public class HttpHijackWorkaround { - "org.glassfish.jersey.message.internal.EntityInputStream", //$NON-NLS-1$ - FilterInputStream.class.getName(), - FilterInputStream.class.getName(), -+ FilterInputStream.class.getName(), - "org.apache.http.conn.EofSensorInputStream", //$NON-NLS-1$ - "org.apache.http.impl.io.IdentityInputStream", //$NON-NLS-1$ - "org.apache.http.impl.io.SessionInputBufferImpl" }; //$NON-NLS-1$ --- -2.7.4 - diff --git a/sources b/sources index e08f4ea..f399853 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.linuxtools-aa54a840151c6b03e22bb9eccb3c8a9de5a1b461.tar.xz) = 385c1bb2f30f8fb85ee9b0aa504a05334e346b2caede1f0ffaf39d87886130878df1e9c50112d9ce6ed9970e7c3a8e9889399725f47ff4806eaf5603194f664c +SHA512 (org.eclipse.linuxtools-7.2.0.tar.xz) = 994754bd2a69526404be2d82bf43102d867e7f8ab753385412d2204fbcca0db559a7b26d9431d04d1809244e6520aeb04dfaf65b45e2dd4e7fe789e9021b9e46

1 0

Architecture specific change in rpms/swt-chart.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/swt-chart.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/swt-chart.git/commit/?id=5c0d7dae2c…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit 5c0d7dae2c085123203598b676017ae3152cad86 Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 10:48:55 2019 +0000 Update license tag Restrict to same architectures as Eclipse itself Don't ship aggregator pom diff --git a/swt-chart.spec b/swt-chart.spec index e61db52..f48a5b1 100644 --- a/swt-chart.spec +++ b/swt-chart.spec @@ -1,14 +1,17 @@ Name: swt-chart Version: 0.10.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: SWTChart Feature -License: EPL +License: EPL-1.0 URL: http://www.swtchart.org/ Source0: http://sourceforge.net/code-snapshots/svn/s/sw/swt-chart/code/swt-chart-cod… BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + BuildRequires: tycho >= 0.14.0 Requires: eclipse-platform >= 3.4.0 @@ -25,6 +28,7 @@ Summary: Javadoc for %{name} %setup -q -n %{name}-code-312-tags-%{version} # Create the poms xmvn -o org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart +%mvn_package "::pom::" __noinstall %mvn_package :org.swtchart.example* __noinstall %build @@ -34,11 +38,15 @@ xmvn -o org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org. %mvn_install %files -f .mfiles -%dir %{_mavenpomdir}/swt-chart %files javadoc -f .mfiles-javadoc %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 0.10.0-7 +- Update license tag +- Restrict to same architectures as Eclipse itself +- Don't ship aggregator pom + * Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

1 0

Architecture specific change in rpms/swt-chart.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/swt-chart.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/swt-chart.git/commit/?id=5c0d7dae2c…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit 5c0d7dae2c085123203598b676017ae3152cad86 Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 10:48:55 2019 +0000 Update license tag Restrict to same architectures as Eclipse itself Don't ship aggregator pom diff --git a/swt-chart.spec b/swt-chart.spec index e61db52..f48a5b1 100644 --- a/swt-chart.spec +++ b/swt-chart.spec @@ -1,14 +1,17 @@ Name: swt-chart Version: 0.10.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: SWTChart Feature -License: EPL +License: EPL-1.0 URL: http://www.swtchart.org/ Source0: http://sourceforge.net/code-snapshots/svn/s/sw/swt-chart/code/swt-chart-cod… BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + BuildRequires: tycho >= 0.14.0 Requires: eclipse-platform >= 3.4.0 @@ -25,6 +28,7 @@ Summary: Javadoc for %{name} %setup -q -n %{name}-code-312-tags-%{version} # Create the poms xmvn -o org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart +%mvn_package "::pom::" __noinstall %mvn_package :org.swtchart.example* __noinstall %build @@ -34,11 +38,15 @@ xmvn -o org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org. %mvn_install %files -f .mfiles -%dir %{_mavenpomdir}/swt-chart %files javadoc -f .mfiles-javadoc %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 0.10.0-7 +- Update license tag +- Restrict to same architectures as Eclipse itself +- Don't ship aggregator pom + * Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

1 0

Architecture specific change in rpms/eclipse-abrt.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/eclipse-abrt.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-abrt.git/commit/?id=db3f035…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit db3f035e973d2c909bddeba68ccd3c728405e971 Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 10:36:23 2019 +0000 Restrict to same architectures as Eclipse itself diff --git a/eclipse-abrt.spec b/eclipse-abrt.spec index f861391..0a3f558 100644 --- a/eclipse-abrt.spec +++ b/eclipse-abrt.spec @@ -1,15 +1,17 @@ Name: eclipse-abrt Version: 0.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Eclipse ABRT plugin License: EPL-1.0 URL: https://pagure.io/eclipse-abrt Source0: https://pagure.io/releases/eclipse-abrt/eclipse-abrt-%{version}.tar.xz - BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: eclipse-platform @@ -38,6 +40,9 @@ This plugin provide support to add error reports from Eclipse to ABRT %files -f .mfiles %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 0.0.3-9 +- Restrict to same architectures as Eclipse itself + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

1 0

Architecture specific change in rpms/eclipse-abrt.git
by githook-noreply＠fedoraproject.org 14 Mar '19

14 Mar '19

The package rpms/eclipse-abrt.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-abrt.git/commit/?id=db3f035…. Change: +ExcludeArch: s390 %{arm} %{ix86} Thanks. Full change: ============ commit db3f035e973d2c909bddeba68ccd3c728405e971 Author: Mat Booth <mat.booth(a)redhat.com> Date: Thu Mar 14 10:36:23 2019 +0000 Restrict to same architectures as Eclipse itself diff --git a/eclipse-abrt.spec b/eclipse-abrt.spec index f861391..0a3f558 100644 --- a/eclipse-abrt.spec +++ b/eclipse-abrt.spec @@ -1,15 +1,17 @@ Name: eclipse-abrt Version: 0.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Eclipse ABRT plugin License: EPL-1.0 URL: https://pagure.io/eclipse-abrt Source0: https://pagure.io/releases/eclipse-abrt/eclipse-abrt-%{version}.tar.xz - BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: eclipse-platform @@ -38,6 +40,9 @@ This plugin provide support to add error reports from Eclipse to ABRT %files -f .mfiles %changelog +* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 0.0.3-9 +- Restrict to same architectures as Eclipse itself + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

1 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes March 2019