Merge pull request #182 from jsrain/master

added handling of release notes for slide show (bnc#871158)
yast · Apr 10, 2014 · 4e9d19b · 4e9d19b
2 parents 0757690 + 9c71cc3
commit 4e9d19b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 09:15:56 UTC 2014 - jsrain@suse.cz
+
+- added handling of release notes for slide show (bnc#871158)
+- 3.1.65
+
 -------------------------------------------------------------------
 Wed Apr  9 10:07:02 CEST 2014 - snwint@suse.de
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.64
+Version:        3.1.65
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires:  yast2-devtools >= 3.1.10
 BuildRequires:  rubygem-rspec
 
 # Linuxrc.keys
-BuildRequires: yast2 >= 3.1.9
+BuildRequires: yast2 >= 3.1.41
 
 # clone_system client
 Requires:       autoyast2-installation >= 3.1.5

diff --git a/src/clients/inst_prepareprogress.rb b/src/clients/inst_prepareprogress.rb
@@ -39,9 +39,17 @@ def main
       Yast.import "ImageInstallation"
       Yast.import "StorageClients"
       Yast.import "PackageSlideShow"
+      Yast.import "Wizard"
+      Yast.import "InstData"
+      Yast.import "Product"
 
       Builtins.y2milestone("BEGIN of inst_prepareprogress.ycp")
 
+      # hide the RN button and set the release notes for SlideShow (bnc#871158)
+      Wizard.HideReleaseNotesButton
+      base_products = Product.FindBaseProducts
+      SlideShow.SetReleaseNotes(InstData.release_notes, base_products[0]["name"])
+
       Packages.SlideShowSetUp(Language.language)
 
       SlideShow.OpenDialog