From 14d8d8790bb3d6394dbd1bf114a729d2afa781b0 Mon Sep 17 00:00:00 2001
From: Frank Schreiner <FSchreiner@suse.com>
Date: Thu, 23 Jul 2020 06:04:07 +0000
Subject: [PATCH] - fix dependencies for Fedora 33 - Set $YAML::XS::LoadBlessed
 = 0 for Appimage/Snapcraft - add a new variable to track build time needed
 for ccache eviction - create folder for ccache archive to be copied before
 rsync - also package pkg-config files by default into baselibs. (bsc#1172563
 etc) - Use shorter kernel flag for mitigations - Ignore, if shutdown behavior
 changed by build in z/VM - Control disk-space consumption while creating
 ccache archive - cleaning ccache - create folders before trying to copy
 ccache.tar - Genreadte .packages and .basepackages files for docker builds

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=421
---
 PKGBUILD                  |  2 +-
 _service                  |  4 ++--
 build.changes             | 15 +++++++++++++++
 build.dsc                 |  2 +-
 build.spec                |  9 +++++++--
 debian.changelog          |  2 +-
 obs-build-20200520.tar.gz |  3 ---
 obs-build-20200723.tar.gz |  3 +++
 8 files changed, 30 insertions(+), 10 deletions(-)
 delete mode 100644 obs-build-20200520.tar.gz
 create mode 100644 obs-build-20200723.tar.gz

diff --git a/PKGBUILD b/PKGBUILD
index 4cfaba93..1e18bab2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20200520
+pkgver=20200723
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
diff --git a/_service b/_service
index aa7e3506..2c0569f7 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="revision">20200520</param>
-    <param name="version">20200520</param>
+    <param name="revision">20200723</param>
+    <param name="version">20200723</param>
     <param name="url">git://github.com/openSUSE/obs-build.git</param>
     <param name="scm">git</param>
     <param name="extract">dist/build.changes</param>
diff --git a/build.changes b/build.changes
index e8937348..2bacac49 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Jul 23 05:38:24 UTC 2020 - Frank Schreiner <FSchreiner@suse.com>
+
+- fix dependencies for Fedora 33
+- Set $YAML::XS::LoadBlessed = 0 for Appimage/Snapcraft
+- add a new variable to track build time needed for ccache eviction
+- create folder for ccache archive to be copied before rsync
+- also package pkg-config files by default into baselibs. (bsc#1172563 etc)
+- Use shorter kernel flag for mitigations
+- Ignore, if shutdown behavior changed by build in z/VM
+- Control disk-space consumption while creating ccache archive
+- cleaning ccache
+- create folders before trying to copy ccache.tar
+- Genreadte .packages and .basepackages files for docker builds
+
 -------------------------------------------------------------------
 Sun May 17 14:32:52 UTC 2020 - coolo@suse.com
 
diff --git a/build.dsc b/build.dsc
index 6258ca8d..975e267c 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20200520
+Version: 20200723
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 1e4e1081..94ad3f97 100644
--- a/build.spec
+++ b/build.spec
@@ -28,7 +28,7 @@ Name:           %{__pkg_name}
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0-only OR GPL-3.0-only
 Group:          Development/Tools/Building
-Version:        20200520
+Version:        20200723
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -88,6 +88,11 @@ Requires:       %{__pkg_name}-mkbaselibs
 Recommends:     %{__pkg_name}-mkdrpms
 %endif
 
+# With fedora 33 the POSIX module was split out of the perl
+# package
+BuildRequires:  perl(POSIX)
+Requires:       perl(POSIX)
+
 %description
 This package provides a script for building RPMs for SUSE Linux in a
 chroot environment.
@@ -118,7 +123,7 @@ for generating delta rpm packages.
 %endif
 
 %define initvm_arch %{_host_cpu}
-%if %{_host_cpu} == "i686"
+%if "%{_host_cpu}" == "i686"
 %define initvm_arch i586
 %endif
 %package initvm-%{initvm_arch}
diff --git a/debian.changelog b/debian.changelog
index fc5ef003..6872b6a2 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-build (20200520) unstable; urgency=low
+build (20200723) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection
diff --git a/obs-build-20200520.tar.gz b/obs-build-20200520.tar.gz
deleted file mode 100644
index c70be621..00000000
--- a/obs-build-20200520.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d37d79f55abb400d488ae0f069e2cc62019345cf2955f69f97febc2d6b38423
-size 347598
diff --git a/obs-build-20200723.tar.gz b/obs-build-20200723.tar.gz
new file mode 100644
index 00000000..bf9447e6
--- /dev/null
+++ b/obs-build-20200723.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aacc6b902862b143566fc09658d5bebcddcf229170ba4f61f7dc3ceb058d9b3d
+size 349012