From 0aede3284ede0219a3c7fd86947339249240c2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?tpg=20=28Tomasz=20Pawe=C2=B3=20Gajc=29?= <tpgxyz@gmail.com>
Date: Thu, 15 Oct 2015 20:05:09 +0200
Subject: [PATCH] fix bugs #1370 and #1208

---
 ...-Make-sure-the-FullName-is-not-empty.patch | 27 +++++++++++++++++++
 0002-do-not-use-users-group.patch             | 14 ++++++++++
 calamares.spec                                |  4 ++-
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 0001-Make-sure-the-FullName-is-not-empty.patch
 create mode 100644 0002-do-not-use-users-group.patch

diff --git a/0001-Make-sure-the-FullName-is-not-empty.patch b/0001-Make-sure-the-FullName-is-not-empty.patch
new file mode 100644
index 0000000..a380fd7
--- /dev/null
+++ b/0001-Make-sure-the-FullName-is-not-empty.patch
@@ -0,0 +1,27 @@
+From 27b5fa4d5baeed5d90a5f93e5b2119d963d5d24f Mon Sep 17 00:00:00 2001
+From: Teo Mrnjavac <teo@kde.org>
+Date: Thu, 15 Oct 2015 13:24:07 +0200
+Subject: [PATCH] Make sure the FullName is not empty.
+
+---
+ src/modules/users/UsersPage.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
+index e1f85cd..aeb7c76 100644
+--- a/src/modules/users/UsersPage.cpp
++++ b/src/modules/users/UsersPage.cpp
+@@ -102,7 +102,9 @@ UsersPage::createJobs( const QString& defaultUserGroup, const QStringList& defau
+ 
+     Calamares::Job* j;
+     j = new CreateUserJob( ui->textBoxUsername->text(),
+-                           QString(),
++                           ui->textBoxFullName->text().isEmpty() ?
++                               ui->textBoxUsername->text() :
++                               ui->textBoxFullName->text(),
+                            ui->checkBoxLoginAuto->isChecked(),
+                            defaultUserGroup,
+                            defaultGroupsList );
+-- 
+1.9.0
+
diff --git a/0002-do-not-use-users-group.patch b/0002-do-not-use-users-group.patch
new file mode 100644
index 0000000..19c7836
--- /dev/null
+++ b/0002-do-not-use-users-group.patch
@@ -0,0 +1,14 @@
+diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
+index 72916eb..776fbfa 100644
+--- a/src/modules/users/CreateUserJob.cpp
++++ b/src/modules/users/CreateUserJob.cpp
+@@ -128,8 +128,7 @@ CreateUserJob::exec()
+                                            "-m",
+                                            "-s",
+                                            "/bin/bash",
+-                                           "-g",
+-                                           "users",
++                                           "-U",
+                                            "-G",
+                                            defaultGroups,
+                                            m_userName } );
diff --git a/calamares.spec b/calamares.spec
index 30df0b0..77a2814 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -9,7 +9,7 @@
 Summary:	Distribution-independent installer framework
 Name:		calamares
 Version:	1.1.4.2
-Release:	1
+Release:	2
 Group:		System/Configuration/Other
 License:	GPLv3+
 URL:		http://calamares.io/
@@ -47,6 +47,8 @@ Source99:	openmandriva-install.svg
 Source100:	OpenMandriva-adverts.tar.xz
 Patch1:		calamares-0.17.0-20150112-openmandriva-desktop-file.patch
 Patch2:		calamares-libparted-detection.patch
+Patch3:		0001-Make-sure-the-FullName-is-not-empty.patch
+Patch4:		0002-do-not-use-users-group.patch
 BuildRequires:	pkgconfig(Qt5Core)
 BuildRequires:	pkgconfig(Qt5DBus)
 BuildRequires:	pkgconfig(Qt5Xml)