Re: [PATCH 7/7] fedora: Pass explicit bindir, mandir, docdir, and drop OpenSUSE override

[Stefano Brivio <sbrivio@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]

On Mon, 29 Aug 2022 17:17:09 +0200
Stefano Brivio <sbrivio(a)redhat.com> wrote:

> Fedora's parameters currently match the ones from the Makefile (which
> is based on GNU recommendations), but that's not necessarily
> guaranteed.
> 
> This should make the OpenSUSE Tumbleweed override for docdir
> unnecessary: drop it.
> 
> Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com>
> Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
> ---
>  contrib/fedora/passt.spec | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec
> index a8af326..ca22d38 100644
> --- a/contrib/fedora/passt.spec
> +++ b/contrib/fedora/passt.spec
> @@ -49,10 +49,8 @@ This package adds SELinux enforcement to passt(1) and pasta(1).
>  %make_build
>  
>  %install
> -%if 0%{?suse_version} > 910
> -%make_install DESTDIR=%{buildroot} prefix=%{_prefix} docdir=%{_prefix}/share/doc/packages/passt
> -%else
> -%make_install DESTDIR=%{buildroot} prefix=%{_prefix}
> +%make_install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_bindir} mandir=%{_mandir} docdir=%{_docdir}/passt
> +
>  %endif

Oops, I forgot to complete a rebase before sending this: this %endif
goes away of course.

-- 
Stefano