kkofler pushed to calamares (f21). "New snapshot (20150502gita70306e54f505). (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 4 00:16:16 UTC 2015 

>From 8f93faae5ddc17047530cd8011fe058f87f7161a Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Mon, 4 May 2015 01:58:50 +0200
Subject: New snapshot (20150502gita70306e54f505).

* Sun May 03 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.1-4.20150502gita70306e54f505
- New snapshot, fixes bugs, improves EFI support, UI and translations
- Drop fix-reboot patch, fixed upstream
- Update default-settings patch
- Update automatic branding generation scriptlet

diff --git a/.gitignore b/.gitignore
index 1d36ecb..e066dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73.tar.gz
 /calamares-5c6a302112cee89476c6846129dfbb64b1cb6079.tar.gz
 /calamares-1.0.1.tar.gz
+/calamares-a70306e54f505bb296700bb6986af7055bdbdf85.tar.gz
diff --git a/calamares-1.0.1-fix-reboot.patch b/calamares-1.0.1-fix-reboot.patch
deleted file mode 100644
index 5640a7c..0000000
--- a/calamares-1.0.1-fix-reboot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur calamares-1.0.1/src/modules/finished/FinishedPage.cpp calamares-1.0.1-fix-reboot/src/modules/finished/FinishedPage.cpp
---- calamares-1.0.1/src/modules/finished/FinishedPage.cpp	2015-01-31 16:06:54.000000000 +0100
-+++ calamares-1.0.1-fix-reboot/src/modules/finished/FinishedPage.cpp	2015-02-05 02:00:37.000000000 +0100
-@@ -90,7 +90,7 @@
-         {
-             if ( ui->restartCheckBox->isVisible() &&
-                  ui->restartCheckBox->isChecked() )
--                QProcess::execute( "/bin/sh", { m_restartNowCommand } );
-+                QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } );
-         } );
-     }
- }
diff --git a/calamares-default-settings.patch b/calamares-default-settings.patch
index e4a3aa1..1ed148c 100644
--- a/calamares-default-settings.patch
+++ b/calamares-default-settings.patch
@@ -1,6 +1,6 @@
-diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/settings.conf calamares-default-settings/settings.conf
---- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/settings.conf	2015-01-05 09:45:40.000000000 +0100
-+++ calamares-default-settings/settings.conf	2015-01-10 03:52:57.000000000 +0100
+diff -ur calamares-a70306e54f505bb296700bb6986af7055bdbdf85/settings.conf calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/settings.conf
+--- calamares-a70306e54f505bb296700bb6986af7055bdbdf85/settings.conf	2015-05-02 10:45:40.000000000 +0200
++++ calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/settings.conf	2015-05-04 00:39:48.000000000 +0200
 @@ -4,7 +4,7 @@
  # Modules can be job modules (with different interfaces) and QtWidgets view modules.
  # They could all be placed in a number of different paths.
@@ -10,7 +10,7 @@ diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/settings.conf calama
  
  # We define the module names in the order they should show up (QtWidget view modules,
  # with one or more pages) OR be executed if enqueued (all other modules).
-@@ -39,18 +39,19 @@
+@@ -39,17 +39,18 @@
  - locale
  - keyboard
  - localecfg
@@ -28,23 +28,25 @@ diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/settings.conf calama
 +- dracut
  #- initramfs
  - grubcfg
- - grub
- #- bootloader
+ - bootloader
 +- packages
  - umount
  
  # Phase 3 - postinstall.
-@@ -67,4 +68,4 @@
+@@ -66,7 +67,7 @@
  # paths relative to the current directory.
  # Only the name of the branding component (directory) should be specified here, Calamares
  # then takes care of finding it and loading the contents.
 -branding: default
 +branding: auto
-diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf
---- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/grub/grub.conf	2015-01-05 09:45:40.000000000 +0100
-+++ calamares-default-settings/src/modules/grub/grub.conf	2015-01-10 03:48:13.000000000 +0100
-@@ -1,11 +1,13 @@
- ---
+ 
+ # If this is set to true, Calamares will show an "are you sure?" prompt right before the
+ # install phase, i.e. at the point of no return. If it's false, no prompt is shown.
+diff -ur calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/bootloader/bootloader.conf calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/bootloader/bootloader.conf
+--- calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/bootloader/bootloader.conf	2015-05-02 10:45:40.000000000 +0200
++++ calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/bootloader/bootloader.conf	2015-05-04 00:31:42.000000000 +0200
+@@ -17,11 +17,13 @@
+ 
  # GRUB 2 binary names and boot directory
  # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
 -grubInstall: "grub-install"
@@ -61,9 +63,9 @@ diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/grub/gru
 +# PACKAGER NOTE: If you really want to change this value, you will also have to
 +#                change the hardcoded directory name in the grub2(-efi) package.
 +efiBootloaderId: "fedora"
-diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf
---- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/locale/locale.conf	2015-01-05 09:45:40.000000000 +0100
-+++ calamares-default-settings/src/modules/locale/locale.conf	2015-01-10 03:48:13.000000000 +0100
+diff -ur calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/locale/locale.conf calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/locale/locale.conf
+--- calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/locale/locale.conf	2015-05-02 10:45:40.000000000 +0200
++++ calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/locale/locale.conf	2015-05-04 00:31:42.000000000 +0200
 @@ -1,3 +1,4 @@
  ---
 -region:     "Europe"
@@ -71,9 +73,9 @@ diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/locale/l
 +# default to UTC
 +region:     "Atlantic"
 +zone:       "Reykjavik"
-diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/packages/packages.conf calamares-default-settings/src/modules/packages/packages.conf
---- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/packages/packages.conf	2015-01-05 09:45:40.000000000 +0100
-+++ calamares-default-settings/src/modules/packages/packages.conf	2015-01-10 04:15:14.000000000 +0100
+diff -ur calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/packages/packages.conf calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/packages/packages.conf
+--- calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/packages/packages.conf	2015-05-02 10:45:40.000000000 +0200
++++ calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/packages/packages.conf	2015-05-04 00:54:30.000000000 +0200
 @@ -9,7 +9,7 @@
  #  - apt         - APT frontend for DEB and RPM
  #  - pacman      - Pacman
@@ -83,7 +85,7 @@ diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/packages
  #
  # List of maps with package operations such as install or remove.
  # Distro developers can provide a list of packages to remove
-@@ -24,18 +24,7 @@
+@@ -24,20 +24,7 @@
  # storage called "packageOperations" and it is processed
  # after the static list in the job configuration.
  #
@@ -105,9 +107,11 @@ diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/packages
 -#    install:
 -#      - pkgs6
 -#      - pkg7
-diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf
---- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/unpackfs/unpackfs.conf	2015-01-05 09:45:40.000000000 +0100
-+++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf	2015-01-10 03:48:13.000000000 +0100
+-#  - localInstall:
+-#      - /path/to/pkg8
+diff -ur calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/unpackfs/unpackfs.conf calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/unpackfs/unpackfs.conf
+--- calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/unpackfs/unpackfs.conf	2015-05-02 10:45:40.000000000 +0200
++++ calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/unpackfs/unpackfs.conf	2015-05-04 00:31:42.000000000 +0200
 @@ -1,8 +1,5 @@
  ---
  unpack:
@@ -118,9 +122,9 @@ diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/unpackfs
 -    -   source: "/path/to/another/filesystem.sqfs"
 -        sourcefs: "squashfs"
 -        destination: ""
-diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf
---- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/users/users.conf	2015-01-05 09:45:40.000000000 +0100
-+++ calamares-default-settings/src/modules/users/users.conf	2015-01-10 03:48:13.000000000 +0100
+diff -ur calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/users/users.conf calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/users/users.conf
+--- calamares-a70306e54f505bb296700bb6986af7055bdbdf85/src/modules/users/users.conf	2015-05-02 10:45:40.000000000 +0200
++++ calamares-a70306e54f505bb296700bb6986af7055bdbdf85-default-settings/src/modules/users/users.conf	2015-05-04 00:31:42.000000000 +0200
 @@ -3,8 +3,7 @@
  defaultGroups:
      - lp
diff --git a/calamares.spec b/calamares.spec
index ff5ba0e..23087a6 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -1,13 +1,15 @@
+%global snapdate 20150502
+%global snaphash a70306e54f505bb296700bb6986af7055bdbdf85
 %global partitionmanagerhash 3f1ace00592088a920f731acb1e42417f71f5e62
 
 Name:           calamares
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{?dist}
 Summary:        Installer from a live CD/DVD/USB to disk
 
 License:        GPLv3+
 URL:            http://calamares.io/
-Source0:        https://github.com/calamares/calamares/archive/v%{version}/calamares-%{version}.tar.gz
+Source0:        https://github.com/calamares/calamares/archive/%{?snaphash}%{!?snaphash:v%{version}}/calamares-%{?snaphash}%{!?snaphash:%{version}}.tar.gz
 Source1:        https://github.com/calamares/partitionmanager/archive/%{partitionmanagerhash}/calamares-partitionmanager-%{partitionmanagerhash}.tar.gz
 Source2:        show.qml
 
@@ -17,10 +19,6 @@ Patch0:         calamares-default-settings.patch
 Patch1:         calamares-desktop-file.patch
 # fix the version number to actually report 1.0.1
 Patch2:         calamares-1.0.1-fix-version.patch
-# fix "restart now" in the "Finished" page to actually reboot
-# https://github.com/calamares/calamares/commit/4e869b221103e55d9f3c081362b2b61a43b13a06
-# https://github.com/calamares/calamares/commit/35a235541f90346cc5bbc4ee9add4c7ed5e1726e
-Patch100:       calamares-1.0.1-fix-reboot.patch
 
 # Calamares is only supported where live images (and GRUB) are. (#1171380)
 # This list matches the livearches global from anaconda.spec
@@ -117,13 +115,12 @@ developing custom modules for Calamares.
 
 
 %prep
-%setup -q -a 1
+%setup -q %{?snaphash:-n %{name}-%{snaphash}} -a 1
 rmdir src/modules/partition/partitionmanager
 mv -f partitionmanager-%{partitionmanagerhash} src/modules/partition/partitionmanager
 %patch0 -p1 -b .default-settings
 %patch1 -p1 -b .desktop-file
 %patch2 -p1 -b .fix-version
-%patch100 -p1 -b .fix-reboot
 # delete backup files so they don't get installed
 rm -f src/modules/*/*.conf.default-settings
 %if 0%{?use_yum}
@@ -164,6 +161,25 @@ else
   SPRITE="%{_datadir}/calamares/branding/default/squid.png"
 fi
 
+if [ -n "$HOME_URL" ] ; then
+  PRODUCTURL="$HOME_URL"
+  HAVE_PRODUCTURL=" "
+else
+  PRODUCTURL="http://calamares.io/"
+  HAVE_PRODUCTURL="#"
+fi
+
+if [ -n "$SUPPORT_URL" ] ; then
+  SUPPORTURL="$SUPPORT_URL"
+  HAVE_SUPPORTURL=" "
+elif [ -n "$BUG_REPORT_URL" ] ; then
+  SUPPORTURL="$BUG_REPORT_URL"
+  HAVE_SUPPORTURL=" "
+else
+  SUPPORTURL="http://calamares.io/bugs/"
+  HAVE_SUPPORTURL="#"
+fi
+
 cat >%{_datadir}/calamares/branding/auto/branding.desc <<EOF
 # THIS FILE IS AUTOMATICALLY GENERATED! ANY CHANGES TO THIS FILE WILL BE LOST!
 ---
@@ -177,12 +193,21 @@ strings:
     versionedName:       "$NAME $VERSION"
     shortVersionedName:  "$NAME $VERSION_ID"
     bootloaderEntryName: "$NAME"
+$HAVE_PRODUCTURL   productUrl:          "$PRODUCTURL"
+$HAVE_SUPPORTURL   supportUrl:          "$SUPPORTURL"
+#   knownIssuesUrl:      "http://calamares.io/about/"
+#   releaseNotesUrl:     "http://calamares.io/about/"
 
 images:
     productLogo:         "$LOGO"
     productIcon:         "$SPRITE"
 
 slideshow:               "show.qml"
+
+style:
+    sidebarBackground:   "#292F34"
+    sidebarText:         "#FFFFFF"
+    sidebarTextSelect:   "#292F34"
 EOF
 
 %files
@@ -219,6 +244,12 @@ EOF
 
 
 %changelog
+* Sun May 03 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.1-4.20150502gita70306e54f505
+- New snapshot, fixes bugs, improves EFI support, UI and translations
+- Drop fix-reboot patch, fixed upstream
+- Update default-settings patch
+- Update automatic branding generation scriptlet
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 1.0.1-3
 - Rebuilt for GCC 5 C++11 ABI change
 
diff --git a/sources b/sources
index 4ae6e5c..6434133 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5f7f2e0ac9a89e8f2390690ce41d2dce  calamares-1.0.1.tar.gz
+7b4c77c71894ac7217283e7ec2da2393  calamares-a70306e54f505bb296700bb6986af7055bdbdf85.tar.gz
 853bb899693b47d43a78e6142d07e235  calamares-partitionmanager-3f1ace00592088a920f731acb1e42417f71f5e62.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calamares.git/commit/?h=f21&id=8f93faae5ddc17047530cd8011fe058f87f7161a

More information about the scm-commits mailing list