From f93c264e8616be130f9dbf49849585a954cc5e21 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 Sep 2020 11:30:22 +0100 Subject: [PATCH] Further unification of Fedora and RHEL spec files. --- nbdkit.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 648ef19..a41f9ac 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -93,7 +93,11 @@ BuildRequires: rb_libtorrent-devel BuildRequires: bash-completion BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) +%if !0%{?rhel} +BuildRequires: platform-python-devel +%else BuildRequires: python3-devel +%endif %if !0%{?rhel} %if 0%{?have_ocaml} # Requires OCaml 4.02.2 which contains fix for @@ -239,8 +243,10 @@ Summary: Example plugins for %{name} License: BSD Requires: %{name}-server%{?_isa} = %{version}-%{release} +%if !0%{?rhel} # example4 is written in Perl. Requires: %{name}-perl-plugin +%endif %description example-plugins @@ -780,8 +786,8 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-gzip-plugin.1* %if 0%{?rhel} # In RHEL, remove some plugins we cannot --disable. for f in cc cdi torrent; do - rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so - rm $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.* + rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so + rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.* done %endif