Hello community, here is the log from the commit of package eclipse-egit for openSUSE:Factory checked in at 2020-07-16 12:11:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-egit (Old) and /work/SRC/openSUSE:Factory/.eclipse-egit.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-egit" Thu Jul 16 12:11:38 2020 rev:2 rq:818527 version:5.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-egit/eclipse-egit.changes 2019-11-19 13:44:09.560420819 +0100 +++ /work/SRC/openSUSE:Factory/.eclipse-egit.new.3592/eclipse-egit.changes 2020-07-16 12:12:14.090587520 +0200 @@ -1,0 +2,5 @@ +Fri Jul 3 09:41:59 UTC 2020 - Fridrich Strba <fst...@suse.com> + +- Upgrade to eclipse-egit 5.8.0 + +------------------------------------------------------------------- Old: ---- egit-v5.1.3.201810200350-r.tar.gz New: ---- egit-v5.8.0.202006091008-r.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-egit.spec ++++++ --- /var/tmp/diff_new_pack.QTTXAQ/_old 2020-07-16 12:12:16.314589768 +0200 +++ /var/tmp/diff_new_pack.QTTXAQ/_new 2020-07-16 12:12:16.318589773 +0200 @@ -1,7 +1,7 @@ # # spec file for package eclipse-egit # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,54 +16,41 @@ # -%global gittag 5.1.3.201810200350-r -%bcond_with mylyn +%global gittag 5.8.0.202006091008-r Name: eclipse-egit -Version: 5.1.3 +Version: 5.8.0 Release: 0 Summary: Eclipse Git Integration License: EPL-2.0 Group: Development/Libraries/Java -URL: http://www.eclipse.org/egit +URL: https://www.eclipse.org/egit # Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144 Source0: https://github.com/eclipse/egit/archive/v%{gittag}/egit-v%{gittag}.tar.gz BuildRequires: eclipse-jdt-bootstrap BuildRequires: eclipse-jgit >= %{version} BuildRequires: eclipse-license2 -BuildRequires: eclipse-platform-bootstrap >= 4.6.0 +BuildRequires: eclipse-platform-bootstrap BuildRequires: maven-antrun-plugin BuildRequires: tycho -#!BuildIgnore: eclipse-platform tycho-bootstrap jgit-bootstrap eclipse-jdt -%if 0 -Requires: eclipse-jgit >= %{version} -Requires: eclipse-platform >= 4.6.0 -%endif -BuildConflicts: java-devel >= 9 +#!BuildIgnore: eclipse-jdt +#!BuildIgnore: eclipse-platform +#!BuildIgnore: tycho-bootstrap #!BuildRequires: log4j eclipse-emf-core eclipse-ecf-core BuildArch: noarch -%if %{with mylyn} -BuildRequires: eclipse-mylyn +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} +%if 0 +Requires: eclipse-jgit >= %{version} +Requires: eclipse-platform %endif %description The eclipse-egit package contains Eclipse plugins for interacting with Git repositories. -%if %{with mylyn} -%package mylyn -Summary: Git integration for mylyn. -Group: Development/Libraries/Java - -%description mylyn -Git integration for mylyn. -%endif - %prep %setup -q -n egit-%{gittag} -# Fix license req -sed -i -e '/license-feature-version/s/2.0.0/0.0.0/' */feature.xml - # Disable unnecessary plugins for RPM builds %pom_remove_plugin :maven-enforcer-plugin @@ -77,22 +64,20 @@ %pom_disable_module org.eclipse.egit.source-feature %pom_disable_module org.eclipse.egit.target -%if %{without mylyn} +# Don't build mylyn feature %pom_disable_module org.eclipse.egit.mylyn.ui %pom_disable_module org.eclipse.egit.mylyn-feature -%endif -# Disable tests for now +# Ensure correct apache sshd bundle gets symlinked +sed -i -e '/jsch/a<import plugin="org.apache.sshd.osgi"/>' org.eclipse.egit-feature/feature.xml + +# Disable tests %pom_disable_module org.eclipse.egit.core.test %pom_disable_module org.eclipse.egit.ui.test -%pom_disable_module org.eclipse.egit.ui.importer.tests %pom_disable_module org.eclipse.egit.gitflow.test %pom_disable_module org.eclipse.egit.mylyn.ui.test %{mvn_package} "::pom::" __noinstall -%if %{with mylyn} -%{mvn_package} :*mylyn* mylyn -%endif %{mvn_package} :* egit %build ++++++ egit-v5.1.3.201810200350-r.tar.gz -> egit-v5.8.0.202006091008-r.tar.gz ++++++ /work/SRC/openSUSE:Factory/eclipse-egit/egit-v5.1.3.201810200350-r.tar.gz /work/SRC/openSUSE:Factory/.eclipse-egit.new.3592/egit-v5.8.0.202006091008-r.tar.gz differ: char 16, line 1
