diff --git a/.files b/.files
index 78bfa41..c2c2e00 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index c9de250..93458ff 100644
--- a/.rev
+++ b/.rev
@@ -7308,4 +7308,11 @@
staging-bot
Automatic update
+
+ 24e8e42b18b6caca79cc43ea4eeec071
+ unknown
+
+ staging-bot
+ Automatic update
+
diff --git a/.servicemark b/.servicemark
index f900c14..a5aaf80 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-5e7a1b8294b7817ca26d0572e4d01fc3
+d43f1255f6a213cd67850065d5e8045e
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index 0e2e924..41e12aa 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -189,7 +189,7 @@ Requires: product_flavor(MicroOS)
openSUSE MicroOS combines the benefits of a rolling OS with a read-only root filesystem with transactional updates. It is a modern Linux Operating System, designed for single-service installations, such as container hosts. It is optimized for large, clustered deployments.
It inherits the benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution.
-%package dvd
+%package -n MicroOS-release-dvd
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -205,7 +205,7 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil
%defattr(-,root,root)
%doc %{_defaultdocdir}/MicroOS-release-dvd
-%package kubic-dvd
+%package -n MicroOS-release-kubic-dvd
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -221,7 +221,7 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil
%defattr(-,root,root)
%doc %{_defaultdocdir}/MicroOS-release-kubic-dvd
-%package appliance
+%package -n MicroOS-release-appliance
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -237,7 +237,7 @@ openSUSE MicroOS combines the benefits of a rolling OS with a read-only root fil
%defattr(-,root,root)
%doc %{_defaultdocdir}/MicroOS-release-appliance
-%package appliance-kubic
+%package -n MicroOS-release-appliance-kubic
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -295,8 +295,8 @@ LOGO="distributor-logo"
EOF
ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
-mkdir -p $RPM_BUILD_ROOT/etc/products.d
-cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
+mkdir -p %{buildroot}%{_sysconfdir}/products.d
+cat >%{buildroot}%{_sysconfdir}/products.d/MicroOS.prod << EOF
openSUSE
@@ -341,26 +341,26 @@ cat >$RPM_BUILD_ROOT/etc/products.d/MicroOS.prod << EOF
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-dvd
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-dvd/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/MicroOS-release-dvd
+cat >%{buildroot}%{_defaultdocdir}/MicroOS-release-dvd/README << EOF
This package only exists for providing the product flavor 'dvd'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-kubic-dvd
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-kubic-dvd/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/MicroOS-release-kubic-dvd
+cat >%{buildroot}%{_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}/MicroOS-release-appliance
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-appliance/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/MicroOS-release-appliance
+cat >%{buildroot}%{_defaultdocdir}/MicroOS-release-appliance/README << EOF
This package only exists for providing the product flavor 'appliance'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-appliance-kubic
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/MicroOS-release-appliance-kubic/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/MicroOS-release-appliance-kubic
+cat >%{buildroot}%{_defaultdocdir}/MicroOS-release-appliance-kubic/README << EOF
This package only exists for providing the product flavor 'appliance-kubic'.
EOF
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index 9ad3095..62da0b6 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -29,7 +29,6 @@ Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnon
AutoReqProv: on
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
non oss repo and cd
@@ -43,8 +42,8 @@ non oss repo and cd
%install
-mkdir -p $RPM_BUILD_ROOT/etc/products.d
-cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF
+mkdir -p %{buildroot}%{_sysconfdir}/products.d
+cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE-Addon-NonOss.prod << EOF
openSUSE
@@ -121,12 +120,9 @@ EOF
-%clean
-rm -rf %buildroot
-
%files
%defattr(644,root,root,755)
-%dir /etc/products.d
-/etc/products.d/*.prod
+%dir %{_sysconfdir}/products.d
+%{_sysconfdir}/products.d/*.prod
%changelog
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 82a2602..f9808bf 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -201,7 +201,7 @@ Requires: product_flavor(openSUSE)
%description
openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
-%package ftp
+%package -n openSUSE-release-ftp
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -216,7 +216,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-ftp
-%package mini
+%package -n openSUSE-release-mini
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -231,7 +231,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-mini
-%package dvd
+%package -n openSUSE-release-dvd
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -246,7 +246,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-dvd
-%package livecd-kde
+%package -n openSUSE-release-livecd-kde
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -261,7 +261,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-livecd-kde
-%package livecd-x11
+%package -n openSUSE-release-livecd-x11
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -276,7 +276,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-livecd-x11
-%package livecd-gnome
+%package -n openSUSE-release-livecd-gnome
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -291,7 +291,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-livecd-gnome
-%package livecd-xfce
+%package -n openSUSE-release-livecd-xfce
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -306,7 +306,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-livecd-xfce
-%package usb-kde
+%package -n openSUSE-release-usb-kde
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -321,7 +321,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-usb-kde
-%package usb-gnome
+%package -n openSUSE-release-usb-gnome
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -336,7 +336,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-usb-gnome
-%package usb-x11
+%package -n openSUSE-release-usb-x11
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -351,7 +351,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-usb-x11
-%package appliance
+%package -n openSUSE-release-appliance
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -366,7 +366,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-appliance
-%package appliance-docker
+%package -n openSUSE-release-appliance-docker
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -381,7 +381,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-appliance-docker
-%package appliance-kvm
+%package -n openSUSE-release-appliance-kvm
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -396,7 +396,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-appliance-kvm
-%package appliance-vmware
+%package -n openSUSE-release-appliance-vmware
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -411,7 +411,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-appliance-vmware
-%package appliance-openstack
+%package -n openSUSE-release-appliance-openstack
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -426,7 +426,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-appliance-openstack
-%package appliance-hyperv
+%package -n openSUSE-release-appliance-hyperv
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -441,7 +441,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-appliance-hyperv
-%package appliance-vagrant
+%package -n openSUSE-release-appliance-vagrant
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -456,7 +456,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-appliance-vagrant
-%package appliance-wsl
+%package -n openSUSE-release-appliance-wsl
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -471,7 +471,7 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
%defattr(-,root,root)
%doc %{_defaultdocdir}/openSUSE-release-appliance-wsl
-%package appliance-custom
+%package -n openSUSE-release-appliance-custom
License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
@@ -545,8 +545,8 @@ for i in *; do
ln -s "%_defaultlicensedir/%name/$i" %{buildroot}%_defaultlicensedir/product/base/$i
done
-mkdir -p $RPM_BUILD_ROOT/etc/products.d
-cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
+mkdir -p %{buildroot}%{_sysconfdir}/products.d
+cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF
openSUSE
@@ -611,116 +611,116 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-ftp
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-ftp/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-ftp
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-ftp/README << EOF
This package only exists for providing the product flavor 'ftp'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-mini
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-mini/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-mini
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-mini/README << EOF
This package only exists for providing the product flavor 'mini'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-dvd
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-dvd/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-dvd
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-dvd/README << EOF
This package only exists for providing the product flavor 'dvd'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-livecd-kde
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-livecd-kde/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-livecd-kde
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-livecd-kde/README << EOF
This package only exists for providing the product flavor 'livecd-kde'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-livecd-x11
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-livecd-x11/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-livecd-x11
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-livecd-x11/README << EOF
This package only exists for providing the product flavor 'livecd-x11'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-livecd-gnome
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-livecd-gnome/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-livecd-gnome
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-livecd-gnome/README << EOF
This package only exists for providing the product flavor 'livecd-gnome'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-livecd-xfce
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-livecd-xfce/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-livecd-xfce
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-livecd-xfce/README << EOF
This package only exists for providing the product flavor 'livecd-xfce'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-usb-kde
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-usb-kde/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-usb-kde
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-usb-kde/README << EOF
This package only exists for providing the product flavor 'usb-kde'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-usb-gnome
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-usb-gnome/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-usb-gnome
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-usb-gnome/README << EOF
This package only exists for providing the product flavor 'usb-gnome'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-usb-x11
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-usb-x11/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-usb-x11
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-usb-x11/README << EOF
This package only exists for providing the product flavor 'usb-x11'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance/README << EOF
This package only exists for providing the product flavor 'appliance'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-docker
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-docker/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-docker
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-docker/README << EOF
This package only exists for providing the product flavor 'appliance-docker'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-kvm
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-kvm/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-kvm
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-kvm/README << EOF
This package only exists for providing the product flavor 'appliance-kvm'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-vmware
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-vmware/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-vmware
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-vmware/README << EOF
This package only exists for providing the product flavor 'appliance-vmware'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-openstack
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-openstack/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-openstack
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-openstack/README << EOF
This package only exists for providing the product flavor 'appliance-openstack'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-hyperv
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-hyperv/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-hyperv
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-hyperv/README << EOF
This package only exists for providing the product flavor 'appliance-hyperv'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-vagrant
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-vagrant/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-vagrant
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-vagrant/README << EOF
This package only exists for providing the product flavor 'appliance-vagrant'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-wsl
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-wsl/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-wsl
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-wsl/README << EOF
This package only exists for providing the product flavor 'appliance-wsl'.
EOF
-mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-custom
-cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-release-appliance-custom/README << EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-custom
+cat >%{buildroot}%{_defaultdocdir}/openSUSE-release-appliance-custom/README << EOF
This package only exists for providing the product flavor 'appliance-custom'.
EOF