From de7abac68de58ff3dcb1ddb26ffb41ccbd4377559e24f320f760b3ba858bc92c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 16 Jul 2021 20:12:45 +0000 Subject: [PATCH] Accepting request 906439 from home:dimstar:Factory OBS-URL: https://build.opensuse.org/request/show/906439 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=154 --- MicroOS-release.spec.in | 3 --- openSUSE-release.spec.in | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/MicroOS-release.spec.in b/MicroOS-release.spec.in index 26a2448..ef0f42b 100644 --- a/MicroOS-release.spec.in +++ b/MicroOS-release.spec.in @@ -192,8 +192,6 @@ mkdir -p %{buildroot}%{_prefix}/lib/issue.d echo -e "\nWelcome to ___SUMMARY___ (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_prefix}/lib/issue.d/10-OS echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-OS -touch %{buildroot}%{_sysconfdir}/motd - # Put EULA into correct place mkdir -p %{buildroot}/%{_sysconfdir}/YaST2/licenses/base cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base @@ -244,7 +242,6 @@ fi %dir %{_sysconfdir}/products.d %{_sysconfdir}/products.d/* %dir %{_sysconfdir}/YaST2/ -%config(noreplace) %{_sysconfdir}/motd %dir %{_sysconfdir}/YaST2/licenses/ %dir %{_sysconfdir}/YaST2/licenses/base/ # no %doc here, or we will not install them diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in index a98b518..ee374fb 100644 --- a/openSUSE-release.spec.in +++ b/openSUSE-release.spec.in @@ -220,7 +220,8 @@ LOGO="distributor-logo" EOF ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release -echo "Have a lot of fun..." > %{buildroot}%{_sysconfdir}/motd +mkdir -p %{buildroot}%{_prefix}/lib/motd.d/ +echo "Have a lot of fun..." > %{buildroot}%{_prefix}/lib/motd.d/welcome # Bug 404141 - /etc/YaST/control.xml should be owned by some package mkdir -p %{buildroot}%{_sysconfdir}/YaST2/ echo %{buildroot} @@ -263,7 +264,7 @@ fi # Bug 404141 - /etc/YaST/control.xml should be owned by some package %dir %{_sysconfdir}/YaST2/ %config %{_sysconfdir}/YaST2/control.xml -%config(noreplace) %{_sysconfdir}/motd +%{_prefix}/lib/motd.d/welcome %dir %{_prefix}/lib/issue.d/ %{_prefix}/lib/issue.d/10-openSUSE.conf %{_prefix}/lib/issue.d/90-openSUSE.conf