diff --git a/openSUSE-MicroOS-release.spec b/MicroOS-release.spec similarity index 86% rename from openSUSE-MicroOS-release.spec rename to MicroOS-release.spec index c9575e25..2c599780 100644 --- a/openSUSE-MicroOS-release.spec +++ b/MicroOS-release.spec @@ -16,7 +16,7 @@ # -Name: openSUSE-MicroOS-release +Name: MicroOS-release Version: 20200718 Release: 0 Summary: openSUSE MicroOS @@ -37,11 +37,13 @@ Provides: distribution-release # MicroOS-release replaces Tumbleweed-Kubic-release Provides: openSUSE-Tumbleweed-Kubic-release Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324 +Provides: openSUSE-MicroOS-release = %{version} +Obsoletes: openSUSE-MicroOS-release <= %{version} # Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384) Provides: product-update() = dup # With more than one product in the FTP tree, yast needs to know which products are installable # The name is referenced by the control file as well -Provides: system-installation() = openSUSE-MicroOS +Provides: system-installation() = MicroOS # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -170,13 +172,13 @@ Provides: weakremover(openssl-debuginfo) ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm %include %{SOURCE100} Provides: %name-%version -Provides: product() = openSUSE-MicroOS -Provides: product(openSUSE-MicroOS) = 20200718-0 +Provides: product() = MicroOS +Provides: product(MicroOS) = 20200718-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20200718 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20200718 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(openSUSE-MicroOS) +Requires: product_flavor(MicroOS) @@ -189,7 +191,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200718-0 +Provides: product_flavor(MicroOS) = 20200718-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -198,14 +200,14 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil %files dvd %defattr(-,root,root) -%doc %{_defaultdocdir}/openSUSE-MicroOS-release-dvd +%doc %{_defaultdocdir}/MicroOS-release-dvd %package kubic-dvd License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(openSUSE-MicroOS) = 20200718-0 +Provides: product_flavor(MicroOS) = 20200718-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -214,14 +216,14 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil %files kubic-dvd %defattr(-,root,root) -%doc %{_defaultdocdir}/openSUSE-MicroOS-release-kubic-dvd +%doc %{_defaultdocdir}/MicroOS-release-kubic-dvd %package appliance License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE-MicroOS) = 20200718-0 +Provides: product_flavor(MicroOS) = 20200718-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -230,14 +232,14 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil %files appliance %defattr(-,root,root) -%doc %{_defaultdocdir}/openSUSE-MicroOS-release-appliance +%doc %{_defaultdocdir}/MicroOS-release-appliance %package appliance-kubic License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(openSUSE-MicroOS) = 20200718-0 +Provides: product_flavor(MicroOS) = 20200718-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -246,7 +248,7 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil %files appliance-kubic %defattr(-,root,root) -%doc %{_defaultdocdir}/openSUSE-MicroOS-release-appliance-kubic +%doc %{_defaultdocdir}/MicroOS-release-appliance-kubic @@ -256,9 +258,9 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil %install mkdir -p %{buildroot}%{_sysconfdir} -mkdir -p %{buildroot}%{_libexecdir}/issue.d -echo -e "\nWelcome to openSUSE MicroOS (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_libexecdir}/issue.d/10-OS -echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-OS +mkdir -p %{buildroot}%{_prefix}/lib/issue.d +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 touch %{buildroot}%{_sysconfdir}/motd @@ -267,14 +269,14 @@ 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 %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then - tar -xzf %{_libexecdir}/skelcd/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 -cat > %{buildroot}%{_libexecdir}/os-release < %{buildroot}%{_prefix}/lib/os-release <$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF +cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF openSUSE - openSUSE-MicroOS + MicroOS 20200718 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-microos:20200718 - openSUSE-MicroOS + cpe:/o:opensuse:microos:20200718 + MicroOS @@ -335,26 +337,26 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-MicroOS.prod << EOF EOF -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-dvd -cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-dvd/README << EOF +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-dvd +cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-dvd/README << EOF This package only exists for providing the product flavor 'dvd'. EOF -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-kubic-dvd -cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-kubic-dvd/README << EOF +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-kubic-dvd +cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-kubic-dvd/README << EOF This package only exists for providing the product flavor 'kubic-dvd'. EOF -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-appliance -cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-appliance/README << EOF +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-appliance +cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-appliance/README << EOF This package only exists for providing the product flavor 'appliance'. EOF -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-appliance-kubic -cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-MicroOS-release-appliance-kubic/README << EOF +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-appliance-kubic +cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-appliance-kubic/README << EOF This package only exists for providing the product flavor 'appliance-kubic'. EOF @@ -366,18 +368,18 @@ EOF # Fix the baseproduct symlink and make sure, it exists if [ -L %{_sysconfdir}/products.d/baseproduct ] ; then PRODLINK=$(basename $(readlink -f %{_sysconfdir}/products.d/baseproduct)) - if [ "$PRODLINK" == "openSUSE-Tumbleweed-Kubic.prod" ]; then + if [ "$PRODLINK" = "openSUSE-Tumbleweed-Kubic.prod" -o "$PRODLINK" = "openSUSE-MicroOS.prod" ]; then rm -f %{_sysconfdir}/products.d/baseproduct fi fi if [ ! -e %{_sysconfdir}/products.d/baseproduct ]; then - ln -sf openSUSE-MicroOS.prod %{_sysconfdir}/products.d/baseproduct + ln -sf MicroOS.prod %{_sysconfdir}/products.d/baseproduct fi %files %defattr(644,root,root,755) %{_sysconfdir}/os-release -%{_libexecdir}/os-release +%{_prefix}/lib/os-release %dir %{_sysconfdir}/products.d %{_sysconfdir}/products.d/* %dir %{_sysconfdir}/YaST2/ @@ -387,7 +389,7 @@ fi # no %doc here, or we will not install them %{_sysconfdir}/YaST2/licenses/base/license*txt %{_sysconfdir}/YaST2/licenses/base/no-acceptance-needed -%dir %{_libexecdir}/issue.d -%{_libexecdir}/issue.d/*-OS +%dir %{_prefix}/lib/issue.d +%{_prefix}/lib/issue.d/*-OS %changelog diff --git a/_multibuild b/_multibuild index 7b2d3883..0a1ab9cf 100644 --- a/_multibuild +++ b/_multibuild @@ -1,5 +1,5 @@ + MicroOS-release openSUSE-Addon-NonOss-release - openSUSE-MicroOS-release openSUSE-release diff --git a/openSUSE-release.spec b/openSUSE-release.spec index a66f1629..706bdaf2 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -493,23 +493,23 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. mkdir license if [ -f /CD1/license.tar.gz ]; then tar -C license -xzf /CD1/license.tar.gz -elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then - tar -C license -xzf %{_libexecdir}/skelcd/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} %{buildroot}%{_libexecdir}/issue.d %{buildroot}/run +mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_prefix}/lib/issue.d %{buildroot}/run -echo -e 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel \\r (\\l).\n' > %{buildroot}%{_libexecdir}/issue.d/10-openSUSE.conf -echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-openSUSE.conf +echo -e 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel \\r (\\l).\n' > %{buildroot}%{_prefix}/lib/issue.d/10-openSUSE.conf +echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-openSUSE.conf echo 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel %%r (%%t).' > %{buildroot}%{_sysconfdir}/issue.net 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 -cat > %{buildroot}%{_libexecdir}/os-release < %{buildroot}%{_prefix}/lib/os-release < %{buildroot}%{_sysconfdir}/motd # Bug 404141 - /etc/YaST/control.xml should be owned by some package @@ -530,8 +530,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/YaST2/ echo %{buildroot} if [ -f /CD1/control.xml ]; then install -m 644 /CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ -elif [ -f %{_libexecdir}/skelcd/CD1/control.xml ]; then - install -m 644 %{_libexecdir}/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ +elif [ -f %{_prefix}/lib/skelcd/CD1/control.xml ]; then + install -m 644 %{_prefix}/lib/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ fi # fate#319341, make openSUSE-release own YaST license files. TODO: @@ -743,14 +743,14 @@ fi %_defaultlicensedir/product/base %license license/* %{_sysconfdir}/os-release -%{_libexecdir}/os-release +%{_prefix}/lib/os-release # Bug 404141 - /etc/YaST/control.xml should be owned by some package %dir %{_sysconfdir}/YaST2/ %config %{_sysconfdir}/YaST2/control.xml %config(noreplace) %{_sysconfdir}/motd -%dir %{_libexecdir}/issue.d/ -%{_libexecdir}/issue.d/10-openSUSE.conf -%{_libexecdir}/issue.d/90-openSUSE.conf +%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 diff --git a/weakremovers.inc b/weakremovers.inc index c2097390..a1bed545 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -9147,6 +9147,7 @@ Provides: weakremover(libLASi1) Provides: weakremover(libLHAPDF-6_1_6) Provides: weakremover(libLHAPDF-6_2_0) Provides: weakremover(libLHAPDF-6_2_1) +Provides: weakremover(libLHAPDF-6_2_3) Provides: weakremover(libLLVM3_8) Provides: weakremover(libLLVM4) Provides: weakremover(libLLVM5) @@ -10742,6 +10743,7 @@ Provides: weakremover(libopencv3_2) Provides: weakremover(libopencv3_3) Provides: weakremover(libopencv4_1) Provides: weakremover(libopencv4_2) +Provides: weakremover(libopendkim10) Provides: weakremover(libopenlibm2) Provides: weakremover(libopenmpi_2_1_2-gnu-hpc) Provides: weakremover(libopenmpi_2_1_5-gnu-hpc)