From 74e1ef669fd16b3ac8810e48fe7e1259d93c421bdbaca541bd58ba1f742e308e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sun, 5 May 2019 08:53:26 +0000
Subject: [PATCH] Fix openSUSE-MicroOS product definition

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=70
---
 openSUSE-MicroOS-release.spec.in | 10 +++++-----
 openSUSE-MicroOS.product.in      | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/openSUSE-MicroOS-release.spec.in b/openSUSE-MicroOS-release.spec.in
index d34b070..9c771a7 100644
--- a/openSUSE-MicroOS-release.spec.in
+++ b/openSUSE-MicroOS-release.spec.in
@@ -90,14 +90,14 @@ ___CREATE_PRODUCT_FILES___
 %post
 # Update from openSUSE-Tumbleweed-Kubic to openSUSE-MicroOS
 # Fix the baseproduct symlink and make sure, it exists
-if [ -L /etc/products.d/baseproduct ] ; then
-    PRODLINK=$(basename $(readlink -f /etc/products.d/baseproduct))
+if [ -L %{_sysconfdir}/products.d/baseproduct ] ; then
+    PRODLINK=$(basename $(readlink -f %{_sysconfdir}/products.d/baseproduct))
     if [ "$PRODLINK"  == "openSUSE-Tumbleweed-Kubic.prod" ]; then
-      rm -f /etc/products.d/baseproduct
+      rm -f %{_sysconfdir}/products.d/baseproduct
     fi
 fi
-if [ ! -e /etc/products.d/baseproduct ]; then
-    ln -sf openSUSE-MicroOS.prod /etc/products.d/baseproduct
+if [ ! -e %{_sysconfdir}/products.d/baseproduct ]; then
+    ln -sf openSUSE-MicroOS.prod %{_sysconfdir}/products.d/baseproduct
 fi
 
 %files
diff --git a/openSUSE-MicroOS.product.in b/openSUSE-MicroOS.product.in
index 7f6b20a..08a6007 100644
--- a/openSUSE-MicroOS.product.in
+++ b/openSUSE-MicroOS.product.in
@@ -102,21 +102,22 @@
       <use group="opensuse_kubic" create_pattern="false"/>
       <use group="opensuse_kubic.x86_64" create_pattern="false"/>
     </media>
-  </mediasets>
-
-  <media type="image"
+    
+    <media type="image"
          flavor="appliance"
          mediastyle="suse-tumbleweed"
          name="openSUSE-MicroOS-appliance" >
     <!-- Create no product media, but a flavor release subpackage -->
-  </media>
+    </media>
 
-  <media type="image"
+    <media type="image"
          flavor="appliance-kubic"
          mediastyle="suse-tumbleweed"
          name="openSUSE-Kubic-appliance" >
     <!-- Create no product media, but a flavor release subpackage -->
-  </media>
+    </media>
+  </mediasets>
+
 
   <xi:include href="opensuse_microos.group"/>
   <xi:include href="opensuse_kubic.group"/>