[PATCH v2 0/2] Two further fixes for Fedora's spec file issues

[PATCH v2 0/2] Two further fixes for Fedora's spec file issues

[Stefano Brivio]

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

...both reported by Daniel.

v2: Details in single patch messages

Stefano Brivio (2):
  fedora: Add %dir entries for own SELinux policy directory and
    documentation
  fedora: Add selinux-policy Requires: tag

 contrib/fedora/passt.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

-- 
2.35.1

[PATCH v2 1/2] fedora: Add %dir entries for own SELinux policy directory and documentation

[Stefano Brivio]

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

fedora-review says:

  Note: No known owner of /usr/share/selinux/packages/passt,
  /usr/share/doc/passt

While at it, replace "passt" by "%{name}" in a few places for
consistency.

Reported-by: Daniel P. Berrangé <berrange(a)redhat.com>
Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
---
v2: Move SELinux entry to the right section, extend usage of %{name}
    further, for consistency (Daniel P. Berrangé)

 contrib/fedora/passt.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec
index 922f584..ca3e8b3 100644
--- a/contrib/fedora/passt.spec
+++ b/contrib/fedora/passt.spec
@@ -49,7 +49,7 @@ This package adds SELinux enforcement to passt(1) and pasta(1).
 %make_build
 
 %install
-%make_install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_bindir} mandir=%{_mandir} docdir=%{_docdir}/passt
+%make_install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_bindir} mandir=%{_mandir} docdir=%{_docdir}/%{name}
 %ifarch x86_64
 ln -sr %{buildroot}%{_mandir}/man1/passt.1 %{buildroot}%{_mandir}/man1/passt.avx2.1
 ln -sr %{buildroot}%{_mandir}/man1/pasta.1 %{buildroot}%{_mandir}/man1/pasta.avx2.1
@@ -71,8 +71,9 @@ semodule -r pasta 2>/dev/null || :
 
 %files
 %license LICENSES/{AGPL-3.0-or-later.txt,BSD-3-Clause.txt}
-%doc %{_docdir}/passt/README.md
-%doc %{_docdir}/passt/demo.sh
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/README.md
+%doc %{_docdir}/%{name}/demo.sh
 %{_bindir}/passt
 %{_bindir}/pasta
 %{_bindir}/qrap
@@ -87,6 +88,7 @@ semodule -r pasta 2>/dev/null || :
 %endif
 
 %files selinux
+%dir %{_datadir}/selinux/packages/%{name}
 %{_datadir}/selinux/packages/%{name}/passt.pp
 %{_datadir}/selinux/packages/%{name}/pasta.pp
 
-- 
@@ -49,7 +49,7 @@ This package adds SELinux enforcement to passt(1) and pasta(1).
 %make_build
 
 %install
-%make_install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_bindir} mandir=%{_mandir} docdir=%{_docdir}/passt
+%make_install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_bindir} mandir=%{_mandir} docdir=%{_docdir}/%{name}
 %ifarch x86_64
 ln -sr %{buildroot}%{_mandir}/man1/passt.1 %{buildroot}%{_mandir}/man1/passt.avx2.1
 ln -sr %{buildroot}%{_mandir}/man1/pasta.1 %{buildroot}%{_mandir}/man1/pasta.avx2.1
@@ -71,8 +71,9 @@ semodule -r pasta 2>/dev/null || :
 
 %files
 %license LICENSES/{AGPL-3.0-or-later.txt,BSD-3-Clause.txt}
-%doc %{_docdir}/passt/README.md
-%doc %{_docdir}/passt/demo.sh
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/README.md
+%doc %{_docdir}/%{name}/demo.sh
 %{_bindir}/passt
 %{_bindir}/pasta
 %{_bindir}/qrap
@@ -87,6 +88,7 @@ semodule -r pasta 2>/dev/null || :
 %endif
 
 %files selinux
+%dir %{_datadir}/selinux/packages/%{name}
 %{_datadir}/selinux/packages/%{name}/passt.pp
 %{_datadir}/selinux/packages/%{name}/pasta.pp
 
-- 
2.35.1

[PATCH v2 2/2] fedora: Add selinux-policy Requires: tag

[Stefano Brivio]

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

fedora-review says:

  Note: Directories without known owners:
  /usr/share/selinux/packages/passt, /usr/share/doc/passt,
  /usr/share/selinux, /usr/share/selinux/packages

and selinux-policy owns those two last ones.

While at it, split Requires: tags also for post and preun actions
onto different lines, for consistency.

Reported-by: Daniel P. Berrangé <berrange(a)redhat.com>
Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
---
v2: Split Requires: tags on separate lines (Daniel P. Berrangé)

 contrib/fedora/passt.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contrib/fedora/passt.spec b/contrib/fedora/passt.spec
index ca3e8b3..bd60650 100644
--- a/contrib/fedora/passt.spec
+++ b/contrib/fedora/passt.spec
@@ -35,8 +35,11 @@ requiring any capabilities or privileges.
 BuildArch:  noarch
 Summary:    SELinux support for passt and pasta
 Requires:   %{name} = %{version}-%{release}
-Requires(post): policycoreutils, %{name}
-Requires(preun): policycoreutils, %{name}
+Requires:   selinux-policy
+Requires(post): %{name}
+Requires(post): policycoreutils
+Requires(preun): %{name}
+Requires(preun): policycoreutils
 
 %description selinux
 This package adds SELinux enforcement to passt(1) and pasta(1).
-- 
@@ -35,8 +35,11 @@ requiring any capabilities or privileges.
 BuildArch:  noarch
 Summary:    SELinux support for passt and pasta
 Requires:   %{name} = %{version}-%{release}
-Requires(post): policycoreutils, %{name}
-Requires(preun): policycoreutils, %{name}
+Requires:   selinux-policy
+Requires(post): %{name}
+Requires(post): policycoreutils
+Requires(preun): %{name}
+Requires(preun): policycoreutils
 
 %description selinux
 This package adds SELinux enforcement to passt(1) and pasta(1).
-- 
2.35.1