From 211c679ab235ba43db95b9052e84fef095dcba133b64ceb1ba713b08a7c1bc95 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Apr 2022 19:04:18 +0000 Subject: [PATCH] Accepting request 969225 from home:dimstar:Factory OBS-URL: https://build.opensuse.org/request/show/969225 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=190 --- openSUSE-release.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in index d6d3327..f193337 100644 --- a/openSUSE-release.spec.in +++ b/openSUSE-release.spec.in @@ -231,6 +231,11 @@ elif [ -f %{_prefix}/lib/skelcd/CD1/control.xml ]; then install -m 644 %{_prefix}/lib/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ fi +# enable vendor change openSUSE,SUSE for DUP from 15.3 to TW (boo#1198332) +mkdir -p %{buildroot}%{_sysconfdir}/zypp/vendors.d +echo -e "[main]\nvendors=openSUSE,SUSE,SUSE LLC \n" > %{buildroot}%{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf + + # fate#319341, make openSUSE-release own YaST license files. TODO: # get rid of /etc/YaST2/licenses install -D -d -m 755 "%{buildroot}%_defaultlicensedir/product/base" @@ -264,6 +269,7 @@ fi # Bug 404141 - /etc/YaST/control.xml should be owned by some package %dir %{_sysconfdir}/YaST2/ %config %{_sysconfdir}/YaST2/control.xml +%config %{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf %{_prefix}/lib/motd.d/welcome %dir %{_prefix}/lib/issue.d/ %{_prefix}/lib/issue.d/10-openSUSE.conf