From bc778448906334eb272bd77fc82c00e032082a42 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 28 Jun 2021 15:41:25 +0100 Subject: [PATCH] Drop dependencies on cdrdao, cdrkit, and dvd+rw-tools for el9+ (#1973071) Resolves: #1973071 --- brasero.spec | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/brasero.spec b/brasero.spec index 5d19174..d1c11a1 100644 --- a/brasero.spec +++ b/brasero.spec @@ -1,8 +1,18 @@ %define basever %(echo %{version} | sed "s/\.[0-9]*$//") +%if 0%{?rhel} >= 9 +%bcond_with cdrdao +%bcond_with cdrkit +%bcond_with dvdrwtools +%else +%bcond_without cdrdao +%bcond_without cdrkit +%bcond_without dvdrwtools +%endif + Name: brasero Version: 3.12.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Gnome CD/DVD burning application @@ -41,14 +51,14 @@ BuildRequires: libappstream-glib BuildRequires: make BuildRequires: yelp-tools -Requires: dvd+rw-tools -Requires: wodim -Requires: genisoimage +%{?with_dvdrwtools:Requires: dvd+rw-tools} +%{?with_cdrkit:Requires: wodim} +%{?with_cdrkit:Requires: genisoimage} Requires: %{name}-libs%{?_isa} = %{version}-%{release} %ifnarch s390x -Requires: cdrdao +%{?with_cdrdao:Requires: cdrdao} %endif -Recommends: icedax +%{?with_cdrkit:Recommends: icedax} %description Simple and easy to use CD/DVD burning application for the Gnome @@ -96,6 +106,9 @@ autoreconf -fi --enable-playlist \ --enable-preview \ --enable-inotify \ + %{!?with_cdrdao:--disable-cdrdao} \ + %{!?with_cdrkit:--disable-cdrkit} \ + %{!?with_dvdrwtools:--disable-growisofs} \ --disable-caches \ --disable-static sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool @@ -161,6 +174,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Mon Jun 28 2021 David King - 3.12.2-17 +- Drop dependencies on cdrdao, cdrkit, and dvd+rw-tools for el9+ (#1973071) + * Thu Apr 15 2021 Mohan Boddu - 3.12.2-16 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937