From 2422825a684ad118655eeb1ed53187a25371a275 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 25 Mar 2021 14:06:42 +0100 Subject: [PATCH] Recommend all the archive handlers etc, instead of hard requiring They may or may not be needed depending on what code is being built. Moving it all to recommends makes it possible for people who e.g. know they don't need or want to install one of these to exclude it. This also makes it simpler for RHEL where we can just leave all of the archive handlers in as recommends, instead of disabling them when they don't happen to be available in RHEL core. --- flatpak-builder.spec | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flatpak-builder.spec b/flatpak-builder.spec index d65e30e..d65c007 100644 --- a/flatpak-builder.spec +++ b/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, @@ -34,23 +34,20 @@ BuildRequires: /usr/bin/xsltproc 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 - 1.0.12-2 +- Recommend all the archive handlers etc, instead of hard requiring + * Wed Feb 17 2021 Kalev Lember - 1.0.12-1 - Update to 1.0.12