Hello community, here is the log from the commit of package dnf-plugins-core for openSUSE:Factory checked in at 2018-04-24 15:34:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dnf-plugins-core (Old) and /work/SRC/openSUSE:Factory/.dnf-plugins-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnf-plugins-core" Tue Apr 24 15:34:27 2018 rev:4 rq:600153 version:2.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/dnf-plugins-core/dnf-plugins-core.changes 2018-01-22 16:20:46.307610310 +0100 +++ /work/SRC/openSUSE:Factory/.dnf-plugins-core.new/dnf-plugins-core.changes 2018-04-24 15:34:27.747328378 +0200 @@ -1,0 +2,6 @@ +Mon Apr 23 21:10:27 UTC 2018 - [email protected] + +- Enable COPR plugin with openSUSE support backported (rh#1570418) + * Add patch: 0001-copr-Add-openSUSE-support.patch + +------------------------------------------------------------------- New: ---- 0001-copr-Add-openSUSE-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dnf-plugins-core.spec ++++++ --- /var/tmp/diff_new_pack.5cOZFx/_old 2018-04-24 15:34:28.423303921 +0200 +++ /var/tmp/diff_new_pack.5cOZFx/_new 2018-04-24 15:34:28.427303775 +0200 @@ -22,8 +22,13 @@ %global dnf_plugins_extra 2.0.0 %global hawkey_version 0.8.0 -# Copr targets not available for openSUSE +%if 0%{?is_opensuse} +# Copr targets are available for openSUSE Leap 15.0 and newer +%bcond_without copr_plugin +%else +# Copr plugin is not supported for this target %bcond_with copr_plugin +%endif # Enable Python 3 by default %bcond_without python3 @@ -45,6 +50,9 @@ Url: https://github.com/rpm-software-management/dnf-plugins-core Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM: Add support for openSUSE targets for COPR plugin +Patch0001: 0001-copr-Add-openSUSE-support.patch + # PATCH-FIX-OPENSUSE: Fix detection of Python 2 Patch1000: dnf-plugins-core-2.1.5-Fix-detection-of-Python-2.patch ++++++ 0001-copr-Add-openSUSE-support.patch ++++++ >From 802458aded0964633f8f97a15477a1857753b943 Mon Sep 17 00:00:00 2001 From: Neal Gompa <[email protected]> Date: Sun, 22 Apr 2018 14:00:56 -0400 Subject: [PATCH] copr: Add openSUSE support This is based on the following upstream commits: * d3854bbf84955a72f444d4c6442d49bd24b424c0 * 19fb75d15f61432ab5fb7be7adc5f5ae62c11d12 --- plugins/copr.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/copr.py b/plugins/copr.py index 2546d03..b9c70d5 100644 --- a/plugins/copr.py +++ b/plugins/copr.py @@ -300,6 +300,14 @@ Do you want to continue?""") chroot = ("mageia-cauldron-{}".format(distarch)) else: chroot = ("mageia-{0}-{1}".format(dist[1], distarch)) + elif "openSUSE" in dist: + # Get distribution architecture (openSUSE does not use $basearch) + distarch = rpm.expandMacro("%{_target_cpu}") + # Set the chroot + if "Tumbleweed" in dist: + chroot = ("opensuse-tumbleweed-{}".format(distarch)) + else: + chroot = ("opensuse-leap-{0}-{1}".format(dist[1], distarch)) else: chroot = ("epel-%s-x86_64" % dist[1].split(".", 1)[0]) return chroot -- 2.14.3
