From 0bff7ac0f72af09182e12574f141122be95f96ba2d582c4dc5606a8ba0344d52 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Fri, 17 Jun 2022 16:19:03 +0000 Subject: [PATCH 1/2] Accepting request 983469 from home:lee_duncan:branches:network - For Tumbleweed, moved logrotate files from user-specific directory /etc/logrotate.d to vendor-specific /usr/etc/logrotate.d (for Stefan Schubert ) OBS-URL: https://build.opensuse.org/request/show/983469 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=203 --- open-iscsi.changes | 8 ++++++++ open-iscsi.spec | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/open-iscsi.changes b/open-iscsi.changes index 5d88a4f..0360270 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 17 16:06:29 UTC 2022 - Lee Duncan + +- For Tumbleweed, moved logrotate files from user-specific + directory /etc/logrotate.d to vendor-specific + /usr/etc/logrotate.d + (for Stefan Schubert ) + ------------------------------------------------------------------- Fri May 13 20:53:23 UTC 2022 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index 145e057..e77170c 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -138,7 +138,12 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio echo > %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi %make_install -C iscsiuio # rename iscsiuio logrotate file to proper name +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_distconfdir}/logrotate.d +mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_distconfdir}/logrotate.d/iscsiuio +%else mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuio +%endif %fdupes %{buildroot}/%{_prefix} %post @@ -217,7 +222,12 @@ fi %{_sbindir}/iscsiuio %{_sbindir}/brcm_iscsiuio %{_mandir}/man8/iscsiuio.8%{ext_man} +%if 0%{?suse_version} > 1500 +%dir %{_distconfdir}/logrotate.d +%config %{_distconfdir}/logrotate.d/iscsiuio +%else %config %{_sysconfdir}/logrotate.d/iscsiuio +%endif %{_unitdir}/iscsiuio.service %{_unitdir}/iscsiuio.socket %{_sbindir}/rciscsiuio From f2229c1695bfb4793c2f5a51f88c43996642a6b4181f41a7637ef4b173cd0247 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Mon, 20 Jun 2022 21:29:23 +0000 Subject: [PATCH 2/2] Accepting request 984062 from home:lee_duncan:branches:network Fix SPEC file: no %config files in /usr OBS-URL: https://build.opensuse.org/request/show/984062 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=204 --- open-iscsi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-iscsi.spec b/open-iscsi.spec index e77170c..f810b9f 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -224,7 +224,7 @@ fi %{_mandir}/man8/iscsiuio.8%{ext_man} %if 0%{?suse_version} > 1500 %dir %{_distconfdir}/logrotate.d -%config %{_distconfdir}/logrotate.d/iscsiuio +%{_distconfdir}/logrotate.d/iscsiuio %else %config %{_sysconfdir}/logrotate.d/iscsiuio %endif