Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/flatpak-builder.git#2422825a684ad118655eeb1ed53187a25371a275

flatpak-builder.spec

@@ -4,7 +4,7 @@
 
 Name:           flatpak-builder
 Version:        1.0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool to build flatpaks from source
 
 # src/builder-utils.c has portions derived from GPLv2+ code,
@@ -19,6 +19,7 @@ BuildRequires:  docbook-style-xsl
 BuildRequires:  flatpak >= %{flatpak_version}
 BuildRequires:  libcap-devel
 BuildRequires:  elfutils-devel
+BuildRequires:  make
 BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(json-glib-1.0)
@@ -29,28 +30,24 @@ BuildRequires:  pkgconfig(ostree-1) >= %{ostree_version}
 BuildRequires:  pkgconfig(yaml-0.1)
 BuildRequires:  /usr/bin/xmlto
 BuildRequires:  /usr/bin/xsltproc
-BuildRequires: make
 
 Requires:       flatpak%{?_isa} >= %{flatpak_version}
 Requires:       glib2%{?_isa} >= %{glib2_version}
 Requires:       ostree-libs%{?_isa} >= %{ostree_version}
-Requires:       /usr/bin/bzip2
-%if ! 0%{?rhel} > 7
-# No bzr in latest RHEL
-Recommends:     /usr/bin/bzr
-%endif
-Requires:       /usr/bin/eu-strip
-Requires:       /usr/bin/git
-Requires:       /usr/bin/lzip
-Requires:       /usr/bin/patch
 Requires:       /usr/bin/rofiles-fuse
-Requires:       /usr/bin/strip
+
+# Recommend various things that may or may not be needed depending on the code being built
+Recommends:     /usr/bin/bzip2
+Recommends:     /usr/bin/bzr
+Recommends:     /usr/bin/eu-strip
+Recommends:     /usr/bin/git
+Recommends:     /usr/bin/lzip
+Recommends:     /usr/bin/patch
+Recommends:     /usr/bin/strip
 Recommends:     /usr/bin/svn
-Requires:       /usr/bin/tar
-Requires:       /usr/bin/unzip
-%if ! 0%{?rhel}
-Requires:       ccache
-%endif
+Recommends:     /usr/bin/tar
+Recommends:     /usr/bin/unzip
+Recommends:     ccache
 
 %description
 Flatpak-builder is a tool for building flatpaks from sources.
@@ -82,6 +79,9 @@ See http://flatpak.org/ for more information.
 
 
 %changelog
+* Thu Mar 25 2021 Kalev Lember <klember@redhat.com> - 1.0.12-2
+- Recommend all the archive handlers etc, instead of hard requiring
+
 * Wed Feb 17 2021 Kalev Lember <klember@redhat.com> - 1.0.12-1
 - Update to 1.0.12