public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Subject: [PATCH 7/7] fedora: Pass explicit bindir, mandir, docdir, and drop OpenSUSE override
Date: Mon, 29 Aug 2022 17:17:09 +0200	[thread overview]
Message-ID: <20220829151709.2650896-8-sbrivio@redhat.com> (raw)
In-Reply-To: <20220829151709.2650896-1-sbrivio@redhat.com>

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

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
 %ifarch x86_64
 ln -sr %{buildroot}%{_mandir}/man1/passt.1 %{buildroot}%{_mandir}/man1/passt.avx2.1
-- 
@@ -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
 %ifarch x86_64
 ln -sr %{buildroot}%{_mandir}/man1/passt.1 %{buildroot}%{_mandir}/man1/passt.avx2.1
-- 
2.35.1


  parent reply	other threads:[~2022-08-29 15:17 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-29 15:17 [PATCH 0/7] Second batch of fixes reported during Fedora package review Stefano Brivio
2022-08-29 15:17 ` [PATCH 1/7] util: Drop any supplementary group before dropping privileges Stefano Brivio
2022-08-30  1:20   ` David Gibson
2022-08-29 15:17 ` [PATCH 2/7] fedora: Adopt versioning guideline for snapshots Stefano Brivio
2022-08-29 19:25   ` Stefano Brivio
2022-08-29 15:17 ` [PATCH 3/7] fedora: Drop SPDX identifier from spec file Stefano Brivio
2022-08-29 15:17 ` [PATCH 4/7] fedora: Drop comment stating the spec file is an example file Stefano Brivio
2022-08-29 15:17 ` [PATCH 5/7] fedora: Define git_hash in spec file and reuse it Stefano Brivio
2022-08-29 15:17 ` [PATCH 6/7] fedora: Use full versioning for SELinux subpackage Requires: tag Stefano Brivio
2022-08-29 15:17 ` Stefano Brivio [this message]
2022-08-29 19:23   ` [PATCH 7/7] fedora: Pass explicit bindir, mandir, docdir, and drop OpenSUSE override Stefano Brivio

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220829151709.2650896-8-sbrivio@redhat.com \
    --to=sbrivio@redhat.com \
    --cc=passt-dev@passt.top \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).