From e1786cd960a23fd815fb05b0adf702f55db54856 Mon Sep 17 00:00:00 2001 From: staging-bot <> Date: Nov 30 2022 15:48:29 +0000 Subject: Update 000release-packages to rev 1965 https://build.opensuse.org/package/rdiff/openSUSE:Factory/000release-packages?linkrev=base&rev=1965 by user staging-bot Automatic update --- diff --git a/.files b/.files index edf9c12..7398354 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 71d9391..1642bc4 100644 --- a/.rev +++ b/.rev @@ -13748,4 +13748,11 @@ staging-bot Automatic update + + f4f9561825878f6b3eb27b035df1f932 + unknown + + staging-bot + Automatic update + diff --git a/.servicemark b/.servicemark index 666df24..c3a2b5d 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -b6c16b3c2a07e1c0988807a84329a284 +c06dc251004e75e4b7d7c25ab43ee94c diff --git a/MicroOS-release.spec b/MicroOS-release.spec index eb4cf00..08c3381 100644 --- a/MicroOS-release.spec +++ b/MicroOS-release.spec @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20221129 +Version: 20221130 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -176,9 +176,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20221129-0 +Provides: product(MicroOS) = 20221130-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20221129 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20221130 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(MicroOS) @@ -194,7 +194,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20221129-0 +Provides: product_flavor(MicroOS) = 20221130-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -210,7 +210,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20221129-0 +Provides: product_flavor(MicroOS) = 20221130-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -224,24 +224,22 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil %prep +%setup -qcT +mkdir license +if [ -f /CD1/license.tar.gz ]; then + tar -C license -xzf /CD1/license.tar.gz +elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then + tar -C license -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz +fi %build %install -mkdir -p %{buildroot}%{_sysconfdir} -mkdir -p %{buildroot}%{_prefix}/lib/issue.d +mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_prefix}/lib/issue.d %{buildroot}/run + echo -e "\nWelcome to openSUSE MicroOS (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_prefix}/lib/issue.d/10-OS echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-OS -# Put EULA into correct place -mkdir -p %{buildroot}/%{_sysconfdir}/YaST2/licenses/base -cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base -if [ -f /CD1/license.tar.gz ]; then - tar -xzf /CD1/license.tar.gz -elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then - tar -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz -fi - VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'` # note: VERSION is an optional field and has no meaning other than informative on a rolling distro # We do thus not add it to the os-release file @@ -261,17 +259,26 @@ LOGO="distributor-logo-MicroOS" EOF ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release +# Put EULA into correct place +install -D -d -m 755 "%{buildroot}%_defaultlicensedir/product/base" +install -D -d -m 755 "%{buildroot}%_defaultlicensedir" +cp -a license "%{buildroot}%_defaultlicensedir/%name" +pushd license +for i in *; do + ln -s "%_defaultlicensedir/%name/$i" %{buildroot}%_defaultlicensedir/product/base/$i +done + mkdir -p %{buildroot}%{_sysconfdir}/products.d cat >%{buildroot}%{_sysconfdir}/products.d/MicroOS.prod << EOF openSUSE MicroOS - 20221129 + 20221130 0 %{_target_cpu} - cpe:/o:opensuse:microos:20221129 + cpe:/o:opensuse:microos:20221130 MicroOS @@ -338,16 +345,13 @@ fi %files %defattr(644,root,root,755) +%dir %_defaultlicensedir/product +%_defaultlicensedir/product/base +%license license/* %{_sysconfdir}/os-release %{_prefix}/lib/os-release %dir %{_sysconfdir}/products.d %{_sysconfdir}/products.d/* -%dir %{_sysconfdir}/YaST2/ -%dir %{_sysconfdir}/YaST2/licenses/ -%dir %{_sysconfdir}/YaST2/licenses/base/ -# no %doc here, or we will not install them -%{_sysconfdir}/YaST2/licenses/base/license*txt -%{_sysconfdir}/YaST2/licenses/base/no-acceptance-needed %dir %{_prefix}/lib/issue.d %{_prefix}/lib/issue.d/*-OS diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index c429e56..89a25ab 100644 --- a/openSUSE-Addon-NonOss-release.spec +++ b/openSUSE-Addon-NonOss-release.spec @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20221129) +# spec file for package openSUSE-Addon-NonOss-release (Version 20221130) # # Copyright (c) 2022 openSUSE. # @@ -16,7 +16,7 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20221129 +Version: 20221130 Release: 0 License: BSD-3-Clause Group: System/Fhs @@ -24,9 +24,9 @@ Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE%2DAddon%2DNonOss -Provides: product(openSUSE-Addon-NonOss) = 20221129-0 +Provides: product(openSUSE-Addon-NonOss) = 20221130-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20221129 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20221130 AutoReqProv: on @@ -49,10 +49,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20221129 + 20221130 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20221129 + cpe:/o:opensuse:opensuse-addon-nonoss:20221130 diff --git a/openSUSE-release.spec b/openSUSE-release.spec index 965d2a6..8c217c6 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20221129 +Version: 20221130 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -178,7 +178,7 @@ Provides: weakremover(openssl-debuginfo) %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20221129-0 +Provides: product(openSUSE) = 20221130-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -192,7 +192,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Dppc64le Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20221129 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20221130 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -206,7 +206,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -221,7 +221,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -236,7 +236,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -251,7 +251,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -266,7 +266,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -281,7 +281,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -296,7 +296,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -311,7 +311,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -326,7 +326,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -341,7 +341,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -356,7 +356,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -371,7 +371,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -386,7 +386,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -401,7 +401,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -416,7 +416,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -431,7 +431,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -446,7 +446,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -461,7 +461,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -476,7 +476,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20221129-0 +Provides: product_flavor(openSUSE) = 20221130-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -540,9 +540,7 @@ fi 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 +# fate#319341, make openSUSE-release own YaST license files. install -D -d -m 755 "%{buildroot}%_defaultlicensedir/product/base" install -D -d -m 755 "%{buildroot}%_defaultlicensedir" cp -a license "%{buildroot}%_defaultlicensedir/%name" @@ -557,10 +555,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20221129 + 20221130 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20221129 + cpe:/o:opensuse:opensuse:20221130 openSUSE @@ -758,10 +756,11 @@ fi %config %{_sysconfdir}/YaST2/control.xml %config %{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf %{_prefix}/lib/motd.d/welcome -%dir %{_prefix}/lib/issue.d/ +%config(noreplace) %{_sysconfdir}/issue.net +%dir %{_sysconfdir}/products.d +%{_sysconfdir}/products.d/* +%dir %{_prefix}/lib/issue.d %{_prefix}/lib/issue.d/10-openSUSE.conf %{_prefix}/lib/issue.d/90-openSUSE.conf -%config(noreplace) %{_sysconfdir}/issue.net -%{_sysconfdir}/products.d %changelog