From 4cbc46c1106b6d58cdf3e3e35ce63ee3aa59cac724dd939cd46164e14afbef93 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Fri, 19 Nov 2021 21:37:43 +0000
Subject: [PATCH] Accepting request 932593 from
 home:jfehlig:branches:Virtualization

- virt-create-rootfs: Fix repository URLs
  Updated virt-create-rootfs.patch
  boo#1192318

- spec: Weaken apparmor-abstractions dependency to Recommends
  bsc#1192119

OBS-URL: https://build.opensuse.org/request/show/932593
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=912
---
 libvirt.changes          | 13 +++++++++++++
 libvirt.spec             |  2 +-
 virt-create-rootfs.patch | 21 +++++++++++++--------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/libvirt.changes b/libvirt.changes
index c874776..f8ebcc9 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Nov 19 21:22:27 UTC 2021 - James Fehlig <jfehlig@suse.com>
+
+- virt-create-rootfs: Fix repository URLs
+  Updated virt-create-rootfs.patch
+  boo#1192318
+
+-------------------------------------------------------------------
+Wed Nov 17 16:27:39 UTC 2021 - James Fehlig <jfehlig@suse.com>
+
+- spec: Weaken apparmor-abstractions dependency to Recommends
+  bsc#1192119
+
 -------------------------------------------------------------------
 Thu Nov  4 16:29:03 UTC 2021 - James Fehlig <jfehlig@suse.com>
 
diff --git a/libvirt.spec b/libvirt.spec
index 3f5f0dd..ec385ab 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -367,7 +367,7 @@ Requires:       qemu-ovmf-x86_64
 Requires:       qemu-uefi-aarch64
 %endif
 %if %{with_apparmor}
-Requires:       apparmor-abstractions
+Recommends:     apparmor-abstractions
 %endif
 
 # Ensure smooth upgrades
diff --git a/virt-create-rootfs.patch b/virt-create-rootfs.patch
index 262e009..39f9af2 100644
--- a/virt-create-rootfs.patch
+++ b/virt-create-rootfs.patch
@@ -2,7 +2,7 @@ Index: libvirt-7.9.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
 +++ libvirt-7.9.0/tools/virt-create-rootfs
-@@ -0,0 +1,231 @@
+@@ -0,0 +1,236 @@
 +#!/bin/sh
 +set -e
 +
@@ -222,10 +222,15 @@ Index: libvirt-7.9.0/tools/virt-create-rootfs
 +
 +    openSUSE-*)
 +        TARGET_VERSION=${DISTRO:9}
-+        REPO="http://download.opensuse.org/distribution/$TARGET_VERSION/repo/oss/"
-+        UPDATE_REPO="http://download.opensuse.org/update/$TARGET_VERSION/"
-+        call_zypper ar "$REPO" "openSUSE"
-+        call_zypper ar "$UPDATE_REPO" "openSUSE udpate"
++        if test $TARGET_VERSION = "tumbleweed"; then
++            REPO="http://download.opensuse.org/tumbleweed/repo/oss/"
++            call_zypper ar "$REPO" "openSUSE"
++        else
++            REPO="http://download.opensuse.org/distribution/leap/$TARGET_VERSION/repo/oss/"
++            UPDATE_REPO="http://download.opensuse.org/update/leap/$TARGET_VERSION/oss/"
++            call_zypper ar "$REPO" "openSUSE"
++            call_zypper ar "$UPDATE_REPO" "openSUSE-udpate"
++        fi
 +        call_zypper in --no-recommends -t pattern base
 +        ;;
 +esac
@@ -285,9 +290,9 @@ Index: libvirt-7.9.0/docs/manpages/virt-create-rootfs.rst
 +
 +Set the name of distribution to use for the root file system.
 +
-+As of now, only SLED-I<XXX>, SLES-I<XXX> and openSUSE-I<XXX> are implemented
-+where I<XXX> is the version number. Note that SUSEConnect is required to
-+handle SLE distributions.
++As of now, only SLED-<XXX>, SLES-<XXX> and openSUSE-<XXX> are implemented
++where <XXX> is the version number. Examples are openSUSE-15.3, openSUSE-tumbleweed,
++and SLES-15.3. Note that SUSEConnect is required to handle SLE distributions.
 +
 +``-a``, ``--arch``
 +