From 21da6a73f16749349d77e1d74cca890e972a3e62 Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 5 Jul 2019 23:35:44 +0100 Subject: [PATCH] Address Fedora review comments Address the following Fedora review comments: - spec: Make the -libs rpm own the /etc/kafs/ directory. - spec: Use %make_build and %make_install to bring in %{?_smp_mflags} - spec: Use %global instead of %define These are from: https://bugzilla.redhat.com/show_bug.cgi?id=1724281 Signed-off-by: David Howells --- redhat/kafs-client.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/redhat/kafs-client.spec b/redhat/kafs-client.spec index 30ff682..a6dc478 100644 --- a/redhat/kafs-client.spec +++ b/redhat/kafs-client.spec @@ -3,7 +3,7 @@ %global libapiversion %{libapivermajor}.1 Name: kafs-client -Version: 0.2 +Version: 0.3 Release: 1%{?dist}%{?buildid} Summary: The basic tools for kAFS and mounter for the AFS dynamic root License: GPLv2+ @@ -64,14 +64,14 @@ Compatibility package providing standard AFS names for tools such as aklog. This package must be uninstalled for kAFS to coexist with another AFS implementation (such as OpenAFS). -%define _hardened_build 1 +%global _hardened_build 1 %global docdir %{_docdir}/kafs-client %prep %setup -q %build -make all \ +%make_build \ ETCDIR=%{_sysconfdir} \ BINDIR=%{_bindir} \ SBINDIR=%{_sbindir} \ @@ -89,7 +89,7 @@ mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_datarootdir} -make DESTDIR=%{buildroot} install \ +%make_install \ ETCDIR=%{_sysconfdir} \ BINDIR=%{_bindir} \ SBINDIR=%{_sbindir} \ @@ -132,6 +132,7 @@ ln -s aklog-kafs %{buildroot}/%{_bindir}/aklog %{_libdir}/libkafs_client.so.%{libapiversion} %{_libdir}/libkafs_client.so.%{libapivermajor} %{datadir} +%{_sysconfdir}/kafs %config(noreplace) %{_sysconfdir}/kafs/client.conf %config(noreplace) %{_sysconfdir}/kafs/client.d @@ -144,6 +145,9 @@ ln -s aklog-kafs %{buildroot}/%{_bindir}/aklog %{_mandir}/man1/aklog.1* %changelog +* Fri Jul 5 2019 David Howells 0.3-1 +- Address Fedora packaging review comments [RH BZ 1724281]. + * Tue Apr 16 2019 David Howells 0.2-1 - Improve aklog-kafs and its manpage. - rpm: Depend on filesystem-afs for /afs dir installation. -- 2.50.1