diff --git a/.files b/.files index 22cab8f..a55356b 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 449a328..e9b6f9d 100644 --- a/.rev +++ b/.rev @@ -1359,4 +1359,12 @@ is not needed. dimstar_suse gcc12 is not yet needed + + 0c9763c7473116ebe2baf9062ece4008 + unknown + + dimstar_suse + + 969225 + diff --git a/.servicemark b/.servicemark deleted file mode 100644 index 843f703..0000000 --- a/.servicemark +++ /dev/null @@ -1 +0,0 @@ -aea3f9a039271e3c0cea1f6074eb11be diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in index 67c36f0..fcf7cca 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