New version 2.0.0

Build with kpmcore support for partitioning routines
New libraries major 2.0.0
Update files

.abf.yml

@@ -1,4 +1,4 @@
 sources:
-  calamares-1.1.4.2.tar.gz: 32c3a6bd38a88f388d8b3c4888c48d1c3ed2f6e5
   rosa-adverts-en.tar.bz2: e7e6a5caf7028edc6ca221d6c493a4aed1420f9d
   rosa-adverts-ru.tar.bz2: c75bc2770cf88f2b87350e083e40e9be1d15c6aa
+  calamares-2.0.tar.gz: 90f8179f48fabc6bbe65fb16aecb2ed7bbf6a0df

0001-Make-sure-the-FullName-is-not-empty.patch

@@ -1,27 +0,0 @@
-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
-

0002-do-not-use-users-group.patch

@@ -1,14 +0,0 @@
-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 } );

0003-do-not-set-default-users-group-on-home.patch

@@ -1,146 +0,0 @@
-From a95be0ca5aae5fa08348b95e631671257effd457 Mon Sep 17 00:00:00 2001
-From: codeworkx <codeworkx@cyanogenmod.org>
-Date: Tue, 17 Nov 2015 21:55:50 +0100
-Subject: [PATCH] don't set default "users" group on home dirs
-
-Fixes CAL-345.
-
-Changing group of home dir to the default "users" group might be a security risk
-because every user which belongs to the default "users" group
-might be able to access private data on home dirs of other users.
----
- src/modules/users/CreateUserJob.cpp |  4 +---
- src/modules/users/CreateUserJob.h   |  2 --
- src/modules/users/UsersPage.cpp     |  3 +--
- src/modules/users/UsersPage.h       |  3 +--
- src/modules/users/UsersViewStep.cpp | 10 +---------
- src/modules/users/UsersViewStep.h   |  1 -
- src/modules/users/users.conf        |  2 +-
- 6 files changed, 4 insertions(+), 18 deletions(-)
-
-diff -urN calamares-1.1.4.2/src/modules/users/CreateUserJob.cpp calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.cpp
---- calamares-1.1.4.2/src/modules/users/CreateUserJob.cpp	2015-11-28 03:10:09.288790701 +1000
-+++ calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.cpp	2015-11-28 03:11:11.054793512 +1000
-@@ -33,13 +33,11 @@
- CreateUserJob::CreateUserJob( const QString& userName,
-                               const QString& fullName,
-                               bool autologin,
--                              const QString& userGroup,
-                               const QStringList& defaultGroups )
-     : Calamares::Job()
-     , m_userName( userName )
-     , m_fullName( fullName )
-     , m_autologin( autologin )
--    , m_userGroup( userGroup )
-     , m_defaultGroups( defaultGroups )
- {
- }
-@@ -148,7 +146,7 @@
-     ec = CalamaresUtils::chrootCall( { "chown",
-                                        "-R",
-                                        QString( "%1:%2" ).arg( m_userName )
--                                                         .arg( m_userGroup ),
-+                                                         .arg( m_userName ),
-                                        QString( "/home/%1" ).arg( m_userName ) } );
-     if ( ec )
-         return Calamares::JobResult::error( tr( "Cannot set home directory ownership for user %1." )
-diff -urN calamares-1.1.4.2/src/modules/users/CreateUserJob.h calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.h
---- calamares-1.1.4.2/src/modules/users/CreateUserJob.h	2015-08-06 19:58:32.000000000 +1000
-+++ calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.h	2015-11-28 03:11:11.054793512 +1000
-@@ -30,7 +30,6 @@
-     CreateUserJob( const QString& userName,
-                    const QString& fullName,
-                    bool autologin,
--                   const QString& userGroup,
-                    const QStringList& defaultGroups );
-     QString prettyName() const override;
-     QString prettyDescription() const override;
-@@ -41,7 +40,6 @@
-     QString m_userName;
-     QString m_fullName;
-     bool m_autologin;
--    QString m_userGroup;
-     QStringList m_defaultGroups;
- };
- 
-diff -urN calamares-1.1.4.2/src/modules/users/users.conf calamares-1.1.4.2-patched/src/modules/users/users.conf
---- calamares-1.1.4.2/src/modules/users/users.conf	2015-08-19 20:52:13.000000000 +1000
-+++ calamares-1.1.4.2-patched/src/modules/users/users.conf	2015-11-28 03:11:11.054793512 +1000
-@@ -1,6 +1,6 @@
- ---
--userGroup:       users
- defaultGroups:
-+    - users
-     - lp
-     - video
-     - network
-diff -urN calamares-1.1.4.2/src/modules/users/UsersPage.cpp calamares-1.1.4.2-patched/src/modules/users/UsersPage.cpp
---- calamares-1.1.4.2/src/modules/users/UsersPage.cpp	2015-11-28 03:10:09.287790701 +1000
-+++ calamares-1.1.4.2-patched/src/modules/users/UsersPage.cpp	2015-11-28 03:11:11.055793512 +1000
-@@ -94,7 +94,7 @@
- 
- 
- QList< Calamares::job_ptr >
--UsersPage::createJobs( const QString& defaultUserGroup, const QStringList& defaultGroupsList )
-+UsersPage::createJobs( const QStringList& defaultGroupsList )
- {
-     QList< Calamares::job_ptr > list;
-     if ( !isReady() )
-@@ -106,7 +106,6 @@
-                                ui->textBoxUsername->text() :
-                                ui->textBoxFullName->text(),
-                            ui->checkBoxLoginAuto->isChecked(),
--                           defaultUserGroup,
-                            defaultGroupsList );
-     list.append( Calamares::job_ptr( j ) );
- 
-diff -urN calamares-1.1.4.2/src/modules/users/UsersPage.h calamares-1.1.4.2-patched/src/modules/users/UsersPage.h
---- calamares-1.1.4.2/src/modules/users/UsersPage.h	2015-08-19 20:52:13.000000000 +1000
-+++ calamares-1.1.4.2-patched/src/modules/users/UsersPage.h	2015-11-28 03:11:46.435795122 +1000
-@@ -40,8 +40,7 @@
- 
-     bool isReady();
- 
--    QList< Calamares::job_ptr > createJobs( const QString& defaultUserGroup,
--                                            const QStringList& defaultGroupsList );
-+    QList< Calamares::job_ptr > createJobs( const QStringList& defaultGroupsList );
- 
-     void onActivate();
- 
-diff -urN calamares-1.1.4.2/src/modules/users/UsersViewStep.cpp calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.cpp
---- calamares-1.1.4.2/src/modules/users/UsersViewStep.cpp	2015-10-01 01:24:47.000000000 +1000
-+++ calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.cpp	2015-11-28 03:11:11.055793512 +1000
-@@ -113,21 +113,13 @@
- {
-     m_jobs.clear();
- 
--    m_jobs.append( m_widget->createJobs( m_userGroup, m_defaultGroups ) );
-+    m_jobs.append( m_widget->createJobs( m_defaultGroups ) );
- }
- 
- 
- void
- UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
- {
--    if ( configurationMap.contains( "userGroup" ) &&
--         configurationMap.value( "userGroup" ).type() == QVariant::String )
--    {
--        m_userGroup = configurationMap.value( "userGroup" ).toString();
--    }
--    if ( m_userGroup.isEmpty() )
--        m_userGroup = QStringLiteral( "users" );
--
-     if ( configurationMap.contains( "defaultGroups" ) &&
-          configurationMap.value( "defaultGroups" ).type() == QVariant::List )
-     {
-diff -urN calamares-1.1.4.2/src/modules/users/UsersViewStep.h calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.h
---- calamares-1.1.4.2/src/modules/users/UsersViewStep.h	2015-10-01 01:24:47.000000000 +1000
-+++ calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.h	2015-11-28 03:11:11.055793512 +1000
-@@ -63,7 +63,6 @@
-     UsersPage* m_widget;
-     QList< Calamares::job_ptr > m_jobs;
- 
--    QString m_userGroup;
-     QStringList m_defaultGroups;
- };
- 

calamares.spec

@@ -1,12 +1,12 @@
-%define major 1
+%define major 2.0.0
 %define libname %mklibname %{name} %{major}
 %define libnameui %mklibname %{name}ui %{major}
 %define devname %mklibname %{name} -d
 
 Summary:	Distribution-independent installer framework
 Name:		calamares
-Version:	1.1.4.2
+Version:	2.0
-Release:	10
+Release:	1
 License:	GPLv3+
 Group:		System/Configuration/Other
 Url:		http://calamares.io/
@@ -39,18 +39,15 @@ Source101:	rosa-adverts-ru.tar.bz2
 Patch0:		calamares-1.1.4.2-polkit-qt5.patch
 Patch1:		calamares-1.1.4.2-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
-Patch5:		0003-do-not-set-default-users-group-on-home.patch
 BuildRequires:	cmake
 BuildRequires:	extra-cmake-modules
-BuildRequires:	imagemagick
 BuildRequires:	boost-devel
 BuildRequires:	boost-python3-devel
 BuildRequires:	kf5coreaddons-devel
 BuildRequires:	kf5config-devel
 BuildRequires:	kf5i18n-devel
 BuildRequires:	kf5solid-devel
+BuildRequires:	kpmcore-devel
 BuildRequires:	yaml-cpp-devel
 BuildRequires:	pkgconfig(polkit-qt5-1)
 BuildRequires:	pkgconfig(python3)
@@ -138,11 +135,10 @@ a graphical installation program based on Qt 5.
 %{_datadir}/calamares/qml/calamares/slideshow/qmldir
 %{_datadir}/applications/calamares.desktop
 %{_datadir}/polkit-1/actions/com.github.calamares.calamares.policy
-%{_iconsdir}/hicolor/*/apps/%{name}.png
+%{_iconsdir}/hicolor/*/apps/%{name}.*
 %{_sysconfdir}/calamares/*.conf
 %{_sysconfdir}/calamares/modules/*.conf
 %{_libdir}/calamares/*
-%{_libdir}/libcalapm.so
 %ghost %{_sysconfdir}/calamares/branding/auto/branding.desc
 %{_sysconfdir}/calamares/branding/auto/*.qml
 %{_sysconfdir}/calamares/branding/auto/*.png
@@ -192,7 +188,7 @@ Group:		System/Libraries
 Shared library for Calamares.
 
 %files -n %{libname}
-%{_libdir}/libcalamares.so.%{major}*
+%{_libdir}/libcalamares.so.%{major}
 
 #----------------------------------------------------------------------------
 
@@ -204,7 +200,7 @@ Group:		System/Libraries
 Shared library for Calamares.
 
 %files -n %{libnameui}
-%{_libdir}/libcalamaresui.so.%{major}*
+%{_libdir}/libcalamaresui.so.%{major}
 
 #----------------------------------------------------------------------------
 
@@ -233,9 +229,6 @@ Development files and headers for Calamares.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 #delete backup files
 rm -f src/modules/*/*.conf.default-settings
@@ -291,9 +284,3 @@ EOF
 # (tpg) install adverts and slideshow
 tar xf %{SOURCE100} -C %{buildroot}%{_sysconfdir}/calamares/branding/auto
 
-# install menu icons
-for N in 16 32 48 64 128 256;
-do
-convert src/branding/default/squid.png -scale ${N}x${N} $N.png;
-install -D -m 0644 $N.png %{buildroot}%{_iconsdir}/hicolor/${N}x${N}/apps/%{name}.png
-done