From ae26b2b3a2b18c0520703789ef5a7168904a7dc3 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 10 Feb 2017 21:02:06 +1000 Subject: [PATCH] New version 3.0.1 --- .abf.yml | 2 +- ...ktop-file.patch => calamares-3.0.1-desktop-file.patch | 9 +++++---- calamares.spec | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) rename calamares-2.2.3-desktop-file.patch => calamares-3.0.1-desktop-file.patch (56%) diff --git a/.abf.yml b/.abf.yml index 4546096..2c6accf 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: rosa-adverts-en.tar.bz2: e7e6a5caf7028edc6ca221d6c493a4aed1420f9d rosa-adverts-ru.tar.bz2: c75bc2770cf88f2b87350e083e40e9be1d15c6aa - calamares-2.3.tar.gz: d3039fa78be3023e855b08cd195ec9704e9bbb8f + calamares-3.0.1.tar.gz: cd56c80974347e1205fd21a58625a66a224fa1f0 diff --git a/calamares-2.2.3-desktop-file.patch b/calamares-3.0.1-desktop-file.patch similarity index 56% rename from calamares-2.2.3-desktop-file.patch rename to calamares-3.0.1-desktop-file.patch index 5b2741d..b83d92a 100644 --- a/calamares-2.2.3-desktop-file.patch +++ b/calamares-3.0.1-desktop-file.patch @@ -1,13 +1,14 @@ -diff -urN calamares-2.2.3/calamares.desktop calamares-2.2.3-patched/calamares.desktop ---- calamares-2.2.3/calamares.desktop 2016-05-28 01:22:15.000000000 +1000 -+++ calamares-2.2.3-patched/calamares.desktop 2016-05-31 20:34:09.684403690 +1000 -@@ -1,11 +1,10 @@ +diff -urN calamares-3.0.1/calamares.desktop calamares-3.0.1-patched/calamares.desktop +--- calamares-3.0.1/calamares.desktop 2017-01-20 02:14:21.000000000 +1000 ++++ calamares-3.0.1-patched/calamares.desktop 2017-02-10 21:00:52.323026731 +1000 +@@ -1,12 +1,11 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Calamares -GenericName=System Installer +Name=Install ROSA Desktop Fresh + Keywords=calamares;system;installer TryExec=calamares Exec=pkexec /usr/bin/calamares -Comment=Calamares — System Installer diff --git a/calamares.spec b/calamares.spec index eb20df7..8d941af 100644 --- a/calamares.spec +++ b/calamares.spec @@ -5,8 +5,8 @@ Summary: Distribution-independent installer framework Name: calamares -Version: 2.3 -Release: 5 +Version: 3.0.1 +Release: 1 License: GPLv3+ Group: System/Configuration/Other Url: http://calamares.io/ @@ -37,7 +37,7 @@ Source24: rosa-webview.conf Source100: rosa-adverts-en.tar.bz2 Source101: rosa-adverts-ru.tar.bz2 Patch0: calamares-1.1.4.2-polkit-qt5.patch -Patch1: calamares-2.2.3-desktop-file.patch +Patch1: calamares-3.0.1-desktop-file.patch Patch2: calamares-libparted-detection.patch BuildRequires: cmake BuildRequires: extra-cmake-modules