All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steve Dickson <steved@redhat.com>
To: Bill Baker <webbaker@gmail.com>, Calum Mackay <calum.mackay@oracle.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH 2/5] fdr.spec: logrotate clean up
Date: Sun, 30 Jan 2022 14:06:08 -0500	[thread overview]
Message-ID: <20220130190611.12292-3-steved@redhat.com> (raw)
In-Reply-To: <20220130190611.12292-1-steved@redhat.com>

Add an requirement for logrotate to be
install and put the nfs.logrotate into
its proper place.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 buildrpm/1.3/fdr.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildrpm/1.3/fdr.spec b/buildrpm/1.3/fdr.spec
index 40dedc9..3484659 100644
--- a/buildrpm/1.3/fdr.spec
+++ b/buildrpm/1.3/fdr.spec
@@ -2,7 +2,7 @@ Summary:	A daemon which enables ftrace probes and harvests the data
 Name:		fdr
 URL:		https://github.com/oracle/fdr.git
 Version:	1.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	UPL
 Source0:	http://people.redhat.com/steved/fdr/%{name}-%{version}.tar.xz
 
@@ -10,7 +10,7 @@ BuildRequires:	gcc
 BuildRequires:	make
 BuildRequires:	sed
 BuildRequires:	systemd-rpm-macros
-Requires:	systemd
+Requires:	systemd logrotate
 
 %description
 The flight data recorder, a daemon which enables ftrace probes
@@ -30,7 +30,8 @@ install -m 755 fdrd %{buildroot}/%{_sbindir}
 
 mkdir -p %{buildroot}%{_datadir}/fdr/samples
 install -m 644 samples/nfs %{buildroot}/%{_datadir}/fdr/samples
-install -m 644 samples/nfs.logrotate %{buildroot}/%{_datadir}/fdr/samples
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+install -m 644 samples/nfs.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/nfs
 
 mkdir -p %{buildroot}/%{_unitdir}
 install -m 644 %{name}.service %{buildroot}/%{_unitdir}/%{name}.service
@@ -51,7 +52,7 @@ install -m 644 fdrd.man %{buildroot}/%{_mandir}/man8/fdrd.8
 %{_sbindir}/fdrd
 %{_unitdir}/fdr.service
 %{_datadir}/fdr/samples/nfs
-%{_datadir}/fdr/samples/nfs.logrotate
+%{_sysconfdir}/logrotate.d/nfs
 %{_mandir}/man8/*
 %doc README.md
 %license LICENSE
-- 
2.34.1


  parent reply	other threads:[~2022-01-30 19:06 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-30 19:06 [PATCH 0/5] Flight Data Recorder Update Steve Dickson
2022-01-30 19:06 ` [PATCH 1/5] Makefile: cleaned up the usage of RPMBUILD_DIR Steve Dickson
2022-01-30 19:06 ` Steve Dickson [this message]
2022-01-30 19:06 ` [PATCH 3/5] systemd: rename service file Steve Dickson
2022-01-30 19:06 ` [PATCH 4/5] saveto verb: Document updated Steve Dickson
2022-01-30 19:06 ` [PATCH 5/5] configs: Add an nfsall.conf config file Steve Dickson

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=20220130190611.12292-3-steved@redhat.com \
    --to=steved@redhat.com \
    --cc=calum.mackay@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=webbaker@gmail.com \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.