new snapshot

.abf.yml

@@ -1,4 +1,4 @@
 sources:
-  calamares-1.0.0-20150331.tar.xz: 07787208ae539131abdc5b7dc91e1a88491eb8b3
+  calamares-1.0.0-20150406.tar.xz: d662731e647d77d2d5be947edc1cdc6f84fd94b6
   calamares-partitionmanager-20150112.tar.xz: 9fd2828fde3ecb3692868ea186469424c5be580e
-  OpenMandriva-adverts.tar.xz: 6becd3e11f1716b97af5b7406241e3d9a0e7fe4f
+  OpenMandriva-adverts.tar.xz: 68847176e9de8ac167705ad206b10a67ecf5266b

0001-Preserve-kernel-parameters-that-aren-t-handled-by-gr.patch

@@ -1,73 +0,0 @@
-From 506ec44d05165d1605ec9eb64efdd8d154597257 Mon Sep 17 00:00:00 2001
-From: Teo Mrnjavac <teo@kde.org>
-Date: Tue, 31 Mar 2015 18:14:33 +0200
-Subject: [PATCH] Preserve kernel parameters that aren't handled by grubcfg.
-
----
- src/modules/grubcfg/main.py | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
-index 1cf40e7..b6d06d0 100644
---- a/src/modules/grubcfg/main.py
-+++ b/src/modules/grubcfg/main.py
-@@ -4,6 +4,7 @@
- # === This file is part of Calamares - <http://github.com/calamares> ===
- #
- #   Copyright 2014-2015, Philip Müller <philm@manjaro.org>
-+#   Copyright 2015,      Teo Mrnjavac <teo@kde.org>
- #
- #   Calamares is free software: you can redistribute it and/or modify
- #   it under the terms of the GNU General Public License as published by
-@@ -20,6 +21,7 @@
- 
- import libcalamares
- import os
-+import re
- 
- 
- def modify_grub_default(partitions, root_mount_point, distributor):
-@@ -46,10 +48,11 @@ def modify_grub_default(partitions, root_mount_point, distributor):
-         if partition["fs"] == "linuxswap":
-             swap_uuid = partition["uuid"]
- 
--    if swap_uuid != "":
--        kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID={!s} quiet {!s}\"".format(swap_uuid, use_splash)
--    else:
--        kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"quiet {!s}\"".format(use_splash)
-+    kernel_params = ["quiet"]
-+    if use_splash:
-+        kernel_params.append(use_splash)
-+    if swap_uuid:
-+        kernel_params.append("resume=UUID={!s}".format(swap_uuid))
- 
-     distributor_line = "GRUB_DISTRIBUTOR=\"{!s}\"".format(distributor_replace)
- 
-@@ -70,9 +73,24 @@ def modify_grub_default(partitions, root_mount_point, distributor):
- 
-         for i in range(len(lines)):
-             if lines[i].startswith("#GRUB_CMDLINE_LINUX_DEFAULT"):
-+                kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
-                 lines[i] = kernel_cmd
-                 have_kernel_cmd = True
-             elif lines[i].startswith("GRUB_CMDLINE_LINUX_DEFAULT"):
-+                regex = re.compile(r"^GRUB_CMDLINE_LINUX_DEFAULT.*=")
-+                line = regex.sub("", lines[i])
-+                line.lstrip()
-+                line.lstrip("\"")
-+                line.rstrip()
-+                line.rstrip("\"")
-+                existing_params = line.split()
-+
-+                for existing_param in existing_params:
-+                    existing_param_name = existing_param.split("=")[0]
-+                    if existing_param_name not in ["quiet", "resume", "splash"]: #the only ones we ever add
-+                        kernel_params.append(existing_param)
-+
-+                kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
-                 lines[i] = kernel_cmd
-                 have_kernel_cmd = True
-             elif lines[i].startswith("#GRUB_DISTRIBUTOR") or lines[i].startswith("GRUB_DISTRIBUTOR"):
--- 
-1.9.0
-

0002-Make-sure-we-write-the-kernel-config-line-anyway.patch

@@ -1,33 +0,0 @@
-From a8b1154470ce543e77a4e2e0d139b5e42a4cb21e Mon Sep 17 00:00:00 2001
-From: Teo Mrnjavac <teo@kde.org>
-Date: Wed, 1 Apr 2015 15:50:13 +0200
-Subject: [PATCH] Make sure we write the kernel config line anyway.
-
----
- src/modules/grubcfg/main.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
-index b6d06d0..eef731b 100644
---- a/src/modules/grubcfg/main.py
-+++ b/src/modules/grubcfg/main.py
-@@ -87,7 +87,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
- 
-                 for existing_param in existing_params:
-                     existing_param_name = existing_param.split("=")[0]
--                    if existing_param_name not in ["quiet", "resume", "splash"]: #the only ones we ever add
-+                    if existing_param_name not in ["quiet", "resume", "splash"]:  # the only ones we ever add
-                         kernel_params.append(existing_param)
- 
-                 kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
-@@ -110,6 +110,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
-                 lines.append("{!s}=\"{!s}\"".format(key, escaped_value))
- 
-     if not have_kernel_cmd:
-+        kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
-         lines.append(kernel_cmd)
- 
-     if not have_distributor_line:
--- 
-1.9.0
-

0003-Fix-regexp-in-grubcfg.patch

@@ -1,35 +0,0 @@
-From debd4bc352ff81c0b0bb46bad429adf1509429a7 Mon Sep 17 00:00:00 2001
-From: Teo Mrnjavac <teo@kde.org>
-Date: Thu, 2 Apr 2015 13:24:47 +0200
-Subject: [PATCH] Fix regexp in grubcfg. CAL-205 #comment Done some fixing,
- please retest when you can.
-
----
- src/modules/grubcfg/main.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
-index eef731b..d34f0c2 100644
---- a/src/modules/grubcfg/main.py
-+++ b/src/modules/grubcfg/main.py
-@@ -77,12 +77,12 @@ def modify_grub_default(partitions, root_mount_point, distributor):
-                 lines[i] = kernel_cmd
-                 have_kernel_cmd = True
-             elif lines[i].startswith("GRUB_CMDLINE_LINUX_DEFAULT"):
--                regex = re.compile(r"^GRUB_CMDLINE_LINUX_DEFAULT.*=")
-+                regex = re.compile(r"^GRUB_CMDLINE_LINUX_DEFAULT\s*=\s*\"")
-                 line = regex.sub("", lines[i])
--                line.lstrip()
--                line.lstrip("\"")
--                line.rstrip()
--                line.rstrip("\"")
-+                line = line.lstrip()
-+                line = line.lstrip("\"")
-+                line = line.rstrip()
-+                line = line.rstrip("\"")
-                 existing_params = line.split()
- 
-                 for existing_param in existing_params:
--- 
-1.9.0
-

calamares.spec

@@ -1,4 +1,4 @@
-%define calamdate 20150331
+%define calamdate 20150406
 %define partdate 20150112
 
 %define major 1
@@ -8,7 +8,7 @@
 Summary:	Distribution-independent installer framework 
 Name:		calamares
 Version:	1.0.0
-Release:	0.%{calamdate}.5
+Release:	0.%{calamdate}.1
 Group:		System/Configuration/Other
 License:	GPLv3+
 URL:		http://calamares.io/
@@ -38,10 +38,6 @@ Source21:	omv-partition.conf
 Source22:	omv-removeuser.conf
 Source100:	OpenMandriva-adverts.tar.xz
 Patch1:		calamares-0.17.0-20150112-openmandriva-desktop-file.patch
-# (tpg) potential fix https://issues.openmandriva.org/show_bug.cgi?id=1154
-Patch2:		0001-Preserve-kernel-parameters-that-aren-t-handled-by-gr.patch
-Patch3:		0002-Make-sure-we-write-the-kernel-config-line-anyway.patch
-Patch4:		0003-Fix-regexp-in-grubcfg.patch
 BuildRequires:	pkgconfig(Qt5Core)
 BuildRequires:	pkgconfig(Qt5DBus)
 BuildRequires:	pkgconfig(Qt5Xml)
@@ -192,10 +188,14 @@ strings:
     productName:         "$NAME"
     shortProductName:    "$NAME"
     version:             "$VERSION"
-    shortVersion:        "$VERSION_ID"
+    shortVersion:        "$VERSION"
     versionedName:       "$NAME $VERSION"
-    shortVersionedName:  "$NAME $VERSION_ID"
+    shortVersionedName:  "$NAME $VERSION"
-    bootloaderEntryName: "$NAME"
+    bootloaderEntryName: "openmandriva"
+    productUrl:          "$HOME_URL"
+    supportUrl:          "$BUG_REPORT_URL"
+    knownIssuesUrl:      "https://wiki.openmandriva.org/en/Release_3/New"
+    releaseNotesUrl:     "https://wiki.openmandriva.org/en/Release_3/Release_Notes"
 
 images:
     productLogo:         "%{_iconsdir}/openmandriva.svg"