From 57fb41b5540302aadbd5a3a072955711320dac3d9fbe5cab6ce9b9a98496b7ad Mon Sep 17 00:00:00 2001 From: David Anes Date: Mon, 20 Jun 2022 16:10:52 +0000 Subject: [PATCH 1/2] Accepting request 983987 from home:schubi2 - Moved logrotate files from user specif directory /etc/logrotate.d to vendor specif directory /usr/etc/logrotate.d. OBS-URL: https://build.opensuse.org/request/show/983987 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=87 --- rsync.changes | 6 ++++++ rsync.spec | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/rsync.changes b/rsync.changes index bcb006b..1a7c151 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 20 13:25:06 UTC 2022 - Stefan Schubert + +- Moved logrotate files from user specif directory /etc/logrotate.d + to vendor specif directory /usr/etc/logrotate.d. + ------------------------------------------------------------------- Tue Apr 19 06:38:55 UTC 2022 - David Anes diff --git a/rsync.spec b/rsync.spec index a640eb2..2319b4f 100644 --- a/rsync.spec +++ b/rsync.spec @@ -105,13 +105,18 @@ export LDFLAGS="-Wl,-z,relro,-z,now -fPIE -pie" %install %make_install rm -f %{buildroot}%{_sbindir}/rsyncd -install -d %{buildroot}%{_sysconfdir}/logrotate.d install -d %{buildroot}%{_sysconfdir}/init.d install -d %{buildroot}%{_sysconfdir}/xinetd.d install -d %{buildroot}%{_sbindir} ln -sf ../bin/rsync %{buildroot}%{_sbindir}/rsyncd install -m 755 support/rsyncstats %{buildroot}%{_bindir} +%if 0%{?suse_version} > 1500 +install -d %{buildroot}%{_distconfdir}/logrotate.d +install -m 644 %{SOURCE2} %{buildroot}%{_distconfdir}/logrotate.d/rsync +%else +install -d %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/rsync +%endif install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rsyncd.conf install -m 600 %{SOURCE6} %{buildroot}%{_sysconfdir}/rsyncd.secrets install -D -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/rsyncd@.service @@ -139,7 +144,11 @@ ln -sf service %{buildroot}%{_sbindir}/rcrsyncd %{_unitdir}/rsyncd.socket %config(noreplace) %{_sysconfdir}/rsyncd.conf %config(noreplace) %{_sysconfdir}/rsyncd.secrets +%if 0%{?suse_version} > 1500 +%config %{_distconfdir}/logrotate.d/rsync +%else %config(noreplace) %{_sysconfdir}/logrotate.d/rsync +%endif %{_sbindir}/rcrsyncd %{_sbindir}/rsyncd %{_bindir}/rsyncstats From 97ea57dfae9daba6338d99835627eded91b3d1fa1c805ccc92ae49017b578659 Mon Sep 17 00:00:00 2001 From: David Anes Date: Tue, 21 Jun 2022 13:40:46 +0000 Subject: [PATCH 2/2] Accepting request 984141 from home:schubi2 - Removed %config flag for files in /usr directory. OBS-URL: https://build.opensuse.org/request/show/984141 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=88 --- rsync.changes | 9 +++++++-- rsync.spec | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rsync.changes b/rsync.changes index 1a7c151..0e787ac 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,8 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 21 10:34:12 UTC 2022 - Stefan Schubert + +- Removed %config flag for files in /usr directory. + ------------------------------------------------------------------- Mon Jun 20 13:25:06 UTC 2022 - Stefan Schubert -- Moved logrotate files from user specif directory /etc/logrotate.d - to vendor specif directory /usr/etc/logrotate.d. +- Moved logrotate files from user specific directory /etc/logrotate.d + to vendor specific directory /usr/etc/logrotate.d. ------------------------------------------------------------------- Tue Apr 19 06:38:55 UTC 2022 - David Anes diff --git a/rsync.spec b/rsync.spec index 2319b4f..f9069f7 100644 --- a/rsync.spec +++ b/rsync.spec @@ -145,7 +145,7 @@ ln -sf service %{buildroot}%{_sbindir}/rcrsyncd %config(noreplace) %{_sysconfdir}/rsyncd.conf %config(noreplace) %{_sysconfdir}/rsyncd.secrets %if 0%{?suse_version} > 1500 -%config %{_distconfdir}/logrotate.d/rsync +%{_distconfdir}/logrotate.d/rsync %else %config(noreplace) %{_sysconfdir}/logrotate.d/rsync %endif