From 565b588f818d3cac43bae25e126bd2efb6474a62 Mon Sep 17 00:00:00 2001
From: Pavel Cahyna <pcahyna@redhat.com>
Date: Feb 09 2021 10:09:47 +0000
Subject: [PATCH 1/2] Make gnuplot dependency and amplot optional


Allows to reduce dependencies, esp. on RHEL.

Without gnuplot, amplot will not be built and included in the package.

---

diff --git a/amanda.spec b/amanda.spec
index 114b3c5..26778e5 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -1,3 +1,9 @@
+%if 0%{?rhel} >= 9
+%bcond_with gnuplot
+%else
+%bcond_without gnuplot
+%endif
+
 %define _libexecdir %{_libdir}
 %define defconfig DailySet1
 %define indexserver amandahost
@@ -42,7 +48,10 @@ License:       BSD and GPLv3+ and GPLv2+ and GPLv2
 URL:           http://www.amanda.org
 BuildRequires: automake autoconf libtool
 BuildRequires: xfsdump
-BuildRequires: gnuplot cups samba-client tar grep
+%if %{with gnuplot}
+BuildRequires: gnuplot
+%endif
+BuildRequires: cups samba-client tar grep
 BuildRequires: gcc-c++ readline-devel libtirpc-devel
 BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st
 BuildRequires: perl-devel perl-generators perl(ExtUtils::Embed) perl(Test::Simple)
@@ -138,6 +147,9 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pi
            --with-group=%amanda_group \
            --with-tmpdir=/var/log/amanda \
            --with-gnutar=/bin/tar \
+%if %{without gnuplot}
+           --without-gnuplot \
+%endif
            --with-ssh-security \
            --with-rsh-security \
            --with-bsdtcp-security \
@@ -227,11 +239,13 @@ make check
 %{_libexecdir}/amanda/amandad
 %{_libexecdir}/amanda/amanda-sh-lib.sh
 %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/ambind
-%{_libexecdir}/amanda/amcat.awk
 %{_libexecdir}/amanda/amndmjob
+%if %{with gnuplot}
+%{_libexecdir}/amanda/amcat.awk
 %{_libexecdir}/amanda/amplot.awk
 %{_libexecdir}/amanda/amplot.g
 %{_libexecdir}/amanda/amplot.gp
+%endif
 %{_libexecdir}/amanda/ndmjob
 
 %{_sbindir}/amandad
@@ -243,7 +257,9 @@ make check
 %{_sbindir}/amcryptsimple
 %{_sbindir}/amgetconf
 %{_sbindir}/amgpgcrypt
+%if %{with gnuplot}
 %{_sbindir}/amplot
+%endif
 %{_sbindir}/amssl
 
 %{perl_vendorarch}/Amanda/
@@ -257,7 +273,9 @@ make check
 %{_mandir}/man7/amanda-scripts.7*
 %{_mandir}/man8/amanda.8*
 %{_mandir}/man8/amarchiver.8*
+%if %{with gnuplot}
 %{_mandir}/man8/amplot.8*
+%endif
 %{_mandir}/man8/script-email.8*
 %{_mandir}/man8/amaespipe.8*
 %{_mandir}/man8/amcrypt-ossl-asym.8*

From 2acaf235d9a398e2145f56f48d508f00109b3a91 Mon Sep 17 00:00:00 2001
From: Pavel Cahyna <pcahyna@redhat.com>
Date: Feb 09 2021 10:16:07 +0000
Subject: [PATCH 2/2] Bump Release and update changelog


---

diff --git a/amanda.spec b/amanda.spec
index 26778e5..7b51476 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -16,7 +16,7 @@
 Summary:       A network-capable tape backup solution
 Name:          amanda
 Version:       3.5.1
-Release:       27%{?dist}
+Release:       28%{?dist}
 Source:        http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1:       amanda.crontab
 Source4:       disklist
@@ -459,6 +459,9 @@ make check
 
 
 %changelog
+* Tue Feb  9 2021 Pavel Cahyna <pcahyna@redhat.com> - 3.5.1-28
+- Make the gnuplot dependency together with building of amplot optional.
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild