From 3fba4dde1895d9b6c3ff9dc7fadd6cb732839ad838d54826f64ac6393985e543 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 15 Aug 2019 09:23:45 +0000
Subject: [PATCH] - Use %OS_VERSION_ID% for Leap version and add the  
 kiwi_metainfo_helper OBS service

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=39
---
 _service                   |  3 +++
 list-x11.sh                |  3 +++
 livecd-leap-gnome.kiwi     |  6 +++---
 livecd-leap-kde.kiwi       |  6 +++---
 livecd-leap-x11.kiwi       | 12 +++++++++---
 livecd-openSUSE.changes    |  6 ++++++
 livecd-tumbleweed-x11.kiwi |  6 ++++++
 pre-checkin.sh             |  2 +-
 8 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 _service

diff --git a/_service b/_service
new file mode 100644
index 0000000..c2048cb
--- /dev/null
+++ b/_service
@@ -0,0 +1,3 @@
+<services>
+        <service mode="buildtime" name="kiwi_metainfo_helper"/>
+</services>
diff --git a/list-x11.sh b/list-x11.sh
index f92fead..5d0306c 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -12,6 +12,9 @@ buildignore gtk3-immodule-inuktitut
 buildignore gtk3-immodule-thai
 buildignore gtk3-immodule-vietnamese
 buildignore gtk3-lang
+buildignore evince-lang
+buildignore hexchat-lang
+buildignore nano-lang
 buildignore zenity-lang
 buildignore alsa
 buildignore alsa-firmware
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 732810c..45cd3e5 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-GNOME-Live" displayname="openSUSE Leap 15.1 GNOME Live">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index b15b0da..c86e0d6 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-KDE-Live" displayname="openSUSE Leap 15.1 KDE Live">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index c757a5e..24a4606 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-Rescue-CD" displayname="openSUSE Leap 15.1 Rescue CD">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -435,6 +435,12 @@
     <ignore name="gtk3-immodule-vietnamese"/>
     <package name="aaa_base" replaces="gtk3-lang"/>
     <ignore name="gtk3-lang"/>
+    <package name="aaa_base" replaces="evince-lang"/>
+    <ignore name="evince-lang"/>
+    <package name="aaa_base" replaces="hexchat-lang"/>
+    <ignore name="hexchat-lang"/>
+    <package name="aaa_base" replaces="nano-lang"/>
+    <ignore name="nano-lang"/>
     <package name="aaa_base" replaces="zenity-lang"/>
     <ignore name="zenity-lang"/>
     <package name="aaa_base" replaces="alsa"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index de95d52..57ac92c 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 15 09:22:47 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Use %OS_VERSION_ID% for Leap version and add the
+  kiwi_metainfo_helper OBS service
+
 -------------------------------------------------------------------
 Fri Jul 26 12:08:16 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 86e9cd0..66af371 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -435,6 +435,12 @@
     <ignore name="gtk3-immodule-vietnamese"/>
     <package name="aaa_base" replaces="gtk3-lang"/>
     <ignore name="gtk3-lang"/>
+    <package name="aaa_base" replaces="evince-lang"/>
+    <ignore name="evince-lang"/>
+    <package name="aaa_base" replaces="hexchat-lang"/>
+    <ignore name="hexchat-lang"/>
+    <package name="aaa_base" replaces="nano-lang"/>
+    <ignore name="nano-lang"/>
     <package name="aaa_base" replaces="zenity-lang"/>
     <ignore name="zenity-lang"/>
     <package name="aaa_base" replaces="alsa"/>
diff --git a/pre-checkin.sh b/pre-checkin.sh
index 84c7b33..4bfe90a 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -33,7 +33,7 @@ archive() {
 for distro in leap tumbleweed; do
 	distroname="openSUSE Tumbleweed"
 	if [ "${distro}" = "leap" ]; then
-		distroname="openSUSE Leap 15.1"
+		distroname="openSUSE Leap %OS_VERSION_ID%"
 	fi
 
 	for flavor in gnome kde xfce x11; do