From 6c9bd9cf130d5d4112965262ed20c3a08c7c0840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Thu, 9 Dec 2021 18:00:39 +0000
Subject: [PATCH] Update to 40

Resolves: rhbz#2011877
---
 .gitignore                  |  1 +
 osbuild-composer.spec       | 13 +++++++++----
 sources                     |  2 +-
 tests/tests_integration.yml |  6 ++++--
 tests/tests_unit.yml        |  6 ++++--
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9bc70d..b035635 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /osbuild-composer-37.tar.gz
 /osbuild-composer-38.tar.gz
 /osbuild-composer-39.tar.gz
+/osbuild-composer-40.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index b3f5810..ff4b217 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        39
+Version:        40
 
 %gometa
 
@@ -113,6 +113,7 @@ sed -i "s/openapi3.Swagger/openapi3.T/;s/openapi3.NewSwaggerLoader().LoadSwagger
 %endif
 
 %build
+export GOFLAGS="-buildmode=pie"
 %if 0%{?rhel}
 GO_BUILD_PATH=$PWD/_build
 install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
@@ -121,7 +122,7 @@ cd $GO_BUILD_PATH/src/%{goipath}
 install -m 0755 -vd _bin
 export PATH=$PWD/_bin${PATH:+:$PATH}
 export GOPATH=$GO_BUILD_PATH:%{gopath}
-export GOFLAGS=-mod=vendor
+export GOFLAGS+=" -mod=vendor"
 %endif
 
 # Set the commit hash so that composer can report what source version
@@ -130,7 +131,7 @@ export GOFLAGS=-mod=vendor
 %if %{?commit:1}0
 export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.GitRev=%{commit}'"
 %endif
-export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{epoch}:%{version}-%{release}.%{_arch}'"
+export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{?epoch:%epoch:}%{version}-%{release}.%{_arch}'"
 
 %gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
 %gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
@@ -283,8 +284,9 @@ install -m 0644 -vp internal/jobqueue/dbjobqueue/schemas/*      %{buildroot}%{_d
 %endif
 
 %check
+export GOFLAGS="-buildmode=pie"
 %if 0%{?rhel}
-export GOFLAGS=-mod=vendor
+export GOFLAGS+=" -mod=vendor"
 export GOPATH=$PWD/_build:%{gopath}
 # cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
 cd $PWD/_build/src/%{goipath}
@@ -441,6 +443,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
+- New upstream release
+
 * Wed Nov 24 2021 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 39-1
 - New upstream release
 
diff --git a/sources b/sources
index 3bede98..600b940 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-39.tar.gz) = dd515c457a3f49c70752f29ff4f098ca7060d9a969d0ff94d9bac5b4aab7961796a37b9779b710d07e689adc089398f74d792c550208159b15b8ea17f31c9a85
+SHA512 (osbuild-composer-40.tar.gz) = 7f469afcfda236dcf02db36792bac0ce27120aff6e0b7b9876c4faaca54af553f04b1b128e958dead9587df7a58c972cc8ece91e04d272caca787a2e64887647
diff --git a/tests/tests_integration.yml b/tests/tests_integration.yml
index 9a75e43..7a9b845 100644
--- a/tests/tests_integration.yml
+++ b/tests/tests_integration.yml
@@ -1,7 +1,9 @@
 - hosts: localhost
   pre_tasks:
-    - name: unmount tmp to use disk for tests
-      shell: umount /tmp
+    - name: make sure that /tmp is sharing disk space with /
+      mount:
+        path: /tmp
+        state: unmounted
       tags:
         - classic
   roles:
diff --git a/tests/tests_unit.yml b/tests/tests_unit.yml
index 0ad8240..6489793 100644
--- a/tests/tests_unit.yml
+++ b/tests/tests_unit.yml
@@ -1,7 +1,9 @@
 - hosts: localhost
   pre_tasks:
-    - name: unmount tmp to use disk for tests
-      shell: umount /tmp
+    - name: make sure that /tmp is sharing disk space with /
+      mount:
+        path: /tmp
+        state: unmounted
       tags:
         - classic
   roles: