From 379cdcf61c2b4ba15446eaa7af7798c05580820c Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Mon, 24 Feb 2020 12:59:13 +0100
Subject: [PATCH] 8 upstream release

Signed-off-by: Tom Gundersen <teg@jklm.no>
---
 osbuild.spec | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/osbuild.spec b/osbuild.spec
index 8ae8dfd..8028613 100644
--- a/osbuild.spec
+++ b/osbuild.spec
@@ -1,14 +1,19 @@
+%global		forgeurl https://github.com/osbuild/osbuild
+
+Version:        8
+
+%forgemeta
+
 %global         pypi_name osbuild
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Version:        7
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        ASL 2.0
 
-URL:            https://github.com/osbuild/osbuild
+URL:            %{forgeurl}
 
-Source0:        https://github.com/osbuild/%{pypi_name}/archive/%{version}.tar.gz
+Source0:        %{forgesource}
 BuildArch:      noarch
 Summary:        A build system for OS images
 
@@ -16,6 +21,7 @@ BuildRequires:  python3-devel
 
 Requires: bash
 Requires: coreutils
+Requires: curl
 Requires: dnf
 Requires: e2fsprogs
 Requires: glibc
@@ -40,7 +46,7 @@ Summary:        %{summary}
 A build system for OS images
 
 %prep
-%autosetup -n %{name}-%{version}
+%forgesetup
 
 %build
 %py3_build
@@ -55,7 +61,10 @@ mkdir -p %{buildroot}%{pkgdir}/assemblers
 install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/
 
 mkdir -p %{buildroot}%{pkgdir}/runners
-install -p -m 0755 $(find runners -type f) %{buildroot}%{pkgdir}/runners
+install -p -m 0755 $(find runners -type f -or -type l) %{buildroot}%{pkgdir}/runners
+
+mkdir -p %{buildroot}%{pkgdir}/sources
+install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources
 
 # mount points for bind mounting the osbuild library
 mkdir -p %{buildroot}%{pkgdir}/stages/osbuild
@@ -65,6 +74,12 @@ mkdir -p %{buildroot}%{pkgdir}/assemblers/osbuild
 %if 0%{?fc30}
 ln -s org.osbuild.fedora30 %{buildroot}%{pkgdir}/runners/org.osbuild.host
 %endif
+%if 0%{?fc31}
+ln -s org.osbuild.fedora31 %{buildroot}%{pkgdir}/runners/org.osbuild.host
+%endif
+%if 0%{?fc32}
+ln -s org.osbuild.fedora32 %{buildroot}%{pkgdir}/runners/org.osbuild.host
+%endif
 %if 0%{?el8}
 ln -s org.osbuild.rhel82 %{buildroot}%{pkgdir}/runners/org.osbuild.host
 %endif