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 <schubi@suse.com>)

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

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 17 16:06:29 UTC 2022 - Lee Duncan <lduncan@suse.com>
+
+- For Tumbleweed, moved logrotate files from user-specific
+  directory /etc/logrotate.d to vendor-specific
+  /usr/etc/logrotate.d
+  (for Stefan Schubert <schubi@suse.com>)
+
 -------------------------------------------------------------------
 Fri May 13 20:53:23 UTC 2022 - Lee Duncan <lduncan@suse.com>
 

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