From 4ac5b75ba3ff54555064e307b5879c612c84e68a20015feb1cd64828655186b4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 21 Jun 2022 08:13:19 +0000 Subject: [PATCH 1/3] Accepting request 984101 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/984101 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=268 --- sssd.changes | 6 ++++++ sssd.spec | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/sssd.changes b/sssd.changes index fb3629c..5efcb75 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 21 06:43:27 UTC 2022 - Stefan Schubert + +- Moved logrotate files from user specif directory /etc/logrotate.d + to vendor specif directory /usr/etc/logrotate.d. + ------------------------------------------------------------------- Wed Jun 15 11:28:35 UTC 2022 - Samuel Cabrero diff --git a/sssd.spec b/sssd.spec index 9fb3446..09abdf0 100644 --- a/sssd.spec +++ b/sssd.spec @@ -404,8 +404,13 @@ b="%buildroot" mkdir -pv "$b/%_sysconfdir/sssd" "$b/%_sysconfdir/sssd/conf.d" install -m600 src/examples/sssd-example.conf "$b/%_sysconfdir/sssd/sssd.conf" install -d "$b/%_unitdir" +%if 0%{?suse_version} > 1500 +install -d "$b/%_distconfdir/logrotate.d" +install -m644 src/examples/logrotate "$b/%_distconfdir/logrotate.d/sssd" +%else install -d "$b/%_sysconfdir/logrotate.d" install -m644 src/examples/logrotate "$b/%_sysconfdir/logrotate.d/sssd" +%endif rm -Rfv "$b/%_initddir" mkdir -pv "$b/%sssdstatedir/mc" @@ -574,7 +579,11 @@ fi %attr(750,root,root) %dir %_localstatedir/log/%name/ %dir %_sysconfdir/sssd/ %config(noreplace) %_sysconfdir/sssd/sssd.conf +%if 0%{?suse_version} > 1500 +%config %_distconfdir/logrotate.d/sssd +%else %config(noreplace) %_sysconfdir/logrotate.d/sssd +%endif %dir %_sysconfdir/sssd/conf.d %config(noreplace) %_pam_confdir/sssd-shadowutils %dir %_datadir/%name/ From 1314f653f0fa63184eee6b682edb18bbe68da5b94ff5d8fd357b61adc26ef9d9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 21 Jun 2022 08:13:38 +0000 Subject: [PATCH 2/3] spello fix OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=269 --- sssd.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sssd.changes b/sssd.changes index 5efcb75..e137037 100644 --- a/sssd.changes +++ b/sssd.changes @@ -2,7 +2,7 @@ Tue Jun 21 06:43:27 UTC 2022 - Stefan Schubert - Moved logrotate files from user specif directory /etc/logrotate.d - to vendor specif directory /usr/etc/logrotate.d. + to vendor-specific directory /usr/etc/logrotate.d. ------------------------------------------------------------------- Wed Jun 15 11:28:35 UTC 2022 - Samuel Cabrero From c6aa571b2d6d05326bd1c9d3fb2246a78a7be15b4b738eab5ea65448ab316dfe Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 21 Jun 2022 13:46:05 +0000 Subject: [PATCH 3/3] Accepting request 984137 from home:schubi2 - Removed %config flag for files in /usr directory. OBS-URL: https://build.opensuse.org/request/show/984137 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=270 --- sssd.changes | 7 ++++++- sssd.spec | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sssd.changes b/sssd.changes index e137037..ffafc9b 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 21 10:19:54 UTC 2022 - Stefan Schubert + +- Removed %config flag for files in /usr directory. + ------------------------------------------------------------------- Tue Jun 21 06:43:27 UTC 2022 - Stefan Schubert -- Moved logrotate files from user specif directory /etc/logrotate.d +- Moved logrotate files from user-specific directory /etc/logrotate.d to vendor-specific directory /usr/etc/logrotate.d. ------------------------------------------------------------------- diff --git a/sssd.spec b/sssd.spec index 09abdf0..2dee27d 100644 --- a/sssd.spec +++ b/sssd.spec @@ -580,7 +580,7 @@ fi %dir %_sysconfdir/sssd/ %config(noreplace) %_sysconfdir/sssd/sssd.conf %if 0%{?suse_version} > 1500 -%config %_distconfdir/logrotate.d/sssd +%_distconfdir/logrotate.d/sssd %else %config(noreplace) %_sysconfdir/logrotate.d/sssd %endif