Hello community,

here is the log from the commit of package calamares for openSUSE:Factory 
checked in at 2020-07-06 16:22:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calamares (Old)
 and      /work/SRC/openSUSE:Factory/.calamares.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "calamares"

Mon Jul  6 16:22:23 2020 rev:14 rq:814560 version:3.2.25

Changes:
--------
--- /work/SRC/openSUSE:Factory/calamares/calamares.changes      2020-02-22 
19:07:27.478468495 +0100
+++ /work/SRC/openSUSE:Factory/.calamares.new.3060/calamares.changes    
2020-07-06 16:27:21.090805031 +0200
@@ -1,0 +2,41 @@
+Sun Jun  7 09:46:46 UTC 2020 - Callum Farmer <callumjfarme...@gmail.com>
+
+- Update to version 3.2.25:
+  - Slideshow improvements
+  - Welcome QML module is now pretty much complete.
+- Removed Qt515_QPainterPath.patch: contained in upstream
+  
+-------------------------------------------------------------------
+Wed Jun  3 20:12:03 UTC 2020 - opensuse.lietuviu.ka...@gmail.com
+
+- Add patch Qt515_QPainterPath.patch to add missing includes 
+  (QPainterPath) for Qt 5.15 compatibility.
+
+-------------------------------------------------------------------
+Thu May 28 18:16:33 UTC 2020 - Callum Farmer <callumjfarme...@gmail.com>
+
+- Correct license
+
+-------------------------------------------------------------------
+Mon May 25 05:51:38 UTC 2020 - opensuse.lietuviu.ka...@gmail.com
+
+- Update generic branding.
+
+-------------------------------------------------------------------
+Sun May 24 18:02:23 UTC 2020 - Callum Farmer <callumjfarme...@gmail.com>
+
+- Added keyring and added SOURCE.asc
+- Patch updates
+- Update to version 3.2.24:
+  - Lots of fixes and additions since 3.2.15:
+   - https://calamares.io/calamares-3.2.16-is-out/
+   - https://calamares.io/calamares-3.2.17-is-out/
+   - https://calamares.io/calamares-3.2.18-is-out/
+   - https://calamares.io/calamares-3.2.19-is-out/
+   - https://calamares.io/calamares-3.2.20-is-out/
+   - https://calamares.io/calamares-3.2.21-is-out/
+   - https://calamares.io/calamares-3.2.22-is-out/
+   - https://calamares.io/calamares-3.2.23-is-out/
+   - https://calamares.io/calamares-3.2.24-is-out/
+
+-------------------------------------------------------------------

Old:
----
  calamares-3.2.15.tar.gz

New:
----
  calamares-3.2.25.tar.gz
  calamares-3.2.25.tar.gz.asc
  calamares.keyring

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ calamares.spec ++++++
--- /var/tmp/diff_new_pack.0L2N4g/_old  2020-07-06 16:27:30.474833804 +0200
+++ /var/tmp/diff_new_pack.0L2N4g/_new  2020-07-06 16:27:30.478833816 +0200
@@ -18,27 +18,29 @@
 
 %define _sover  3
 Name:           calamares
-Version:        3.2.15
+Version:        3.2.25
 Release:        0
 Summary:        Installer from a live CD/DVD/USB to disk
-License:        GPL-3.0-only
+License:        GPL-3.0-or-later
 Group:          System/Management
-URL:            http://calamares.io/
+URL:            https://calamares.io/
 Source0:        
https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source1:        
https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
+Source2:        calamares.keyring
 # new generic branding.desc with explanations in comments
-Source1:        branding.desc
-Source2:        %{name}-rpmlintrc
+Source3:        branding.desc
+Source4:        %{name}-rpmlintrc
 # .desktop file customizations to use kdesu from kde-cli-tools5 instead of 
Polkit pkexec
 Patch0:         %{name}-desktop-file.patch
 # adjust some default settings (default shipped .conf files) for openSUSE and 
openSUSE based appliances
 Patch1:         3.2-packages.conf.patch
 Patch2:         3.2-bootloader.conf.patch
+Patch3:         3.2-show.qml.patch
 Patch4:         3.2-settings.conf.patch
 Patch5:         3.2.15-unpackfs.conf_Leap15.patch
 Patch6:         3.2.15-configuring_autologin_in_sysconfig.patch
 Patch7:         3.2-removeuser.conf.patch
 Patch8:         3.2-welcome.conf.patch
-Patch9:         3.2-show.qml.patch
 Provides:       %{name}-libs%{_sover} = %{version}
 Obsoletes:      %{name}-libs%{_sover} < %{version}
 BuildRequires:  cmake >= 3.2
@@ -147,16 +149,16 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-cp -f %{SOURCE1} src/branding/default/
+cp -f %{SOURCE3} src/branding/default/
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 # fix shebang 
 find . -wholename "./src/modules/*/main.py" -exec sed -re 
"1s/^#\!\/usr\/bin\/env python3/#\!\/usr\/bin\/python3/" -i {} \;
 

++++++ 3.2-packages.conf.patch ++++++
--- /var/tmp/diff_new_pack.0L2N4g/_old  2020-07-06 16:27:30.494833865 +0200
+++ /var/tmp/diff_new_pack.0L2N4g/_new  2020-07-06 16:27:30.498833878 +0200
@@ -5,8 +5,8 @@
 diff --git a/src/modules/packages/packages.conf 
b/src/modules/packages/packages.conf
 --- a/src/modules/packages/packages.conf
 +++ b/src/modules/packages/packages.conf
-@@ -12,7 +12,7 @@
- #  - entropy     - Sabayon package manager
+@@ -13,7 +13,7 @@
+ #  - apk         = Alpine Linux package manager
  #  - dummy       - Dummy manager, only logs
  #
 -backend: dummy
@@ -14,7 +14,7 @@
  
  #
  # Often package installation needs an internet connection.
-@@ -28,7 +28,7 @@
+@@ -37,7 +37,7 @@
  # Therefore set also "update_system" to 'true'.
  #
  skip_if_no_internet: false
@@ -23,7 +23,7 @@
  update_system: false
  
  #
-@@ -159,12 +159,6 @@
+@@ -163,12 +163,6 @@
  # of packages, this can lead to a considerable time savings.
  #
  operations:

++++++ 3.2-removeuser.conf.patch ++++++
--- /var/tmp/diff_new_pack.0L2N4g/_old  2020-07-06 16:27:30.502833890 +0200
+++ /var/tmp/diff_new_pack.0L2N4g/_new  2020-07-06 16:27:30.506833902 +0200
@@ -7,10 +7,9 @@
 diff -ur a/src/modules/removeuser/removeuser.conf 
b/src/modules/removeuser/removeuser.conf
 --- a/src/modules/removeuser/removeuser.conf
 +++ b/src/modules/removeuser/removeuser.conf
-@@ -3,4 +3,4 @@
- # spills into the target system.
+@@ -7,4 +7,4 @@
+ # continues as normal.
  ---
  # Username in the target system to be removed.
 -username: live
 +username: linux
-\ No newline at end of file

++++++ 3.2-settings.conf.patch ++++++
--- /var/tmp/diff_new_pack.0L2N4g/_old  2020-07-06 16:27:30.514833927 +0200
+++ /var/tmp/diff_new_pack.0L2N4g/_new  2020-07-06 16:27:30.514833927 +0200
@@ -10,7 +10,7 @@
 diff --git a/settings.conf b/settings.conf
 --- a/settings.conf
 +++ b/settings.conf
-@@ -112,16 +112,18 @@
+@@ -111,16 +111,18 @@
  #  - dracutlukscfg
  #  - plymouthcfg
 -  - initcpiocfg

++++++ 3.2-welcome.conf.patch ++++++
--- /var/tmp/diff_new_pack.0L2N4g/_old  2020-07-06 16:27:30.526833963 +0200
+++ /var/tmp/diff_new_pack.0L2N4g/_new  2020-07-06 16:27:30.530833976 +0200
@@ -1,24 +1,26 @@
 Calamares is often used in openSUSE based appliances, thus 
 it is better not to show URLs at first dialog.
-Internet connection is not mandatory for installtion.
+Internet connection is not mandatory for installation.
 
 diff -ur a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf
 --- a/src/modules/welcome/welcome.conf
 +++ b/src/modules/welcome/welcome.conf
-@@ -7,9 +7,9 @@
+@@ -12,10 +12,10 @@
  # The setting can also be a full URL which will then be used
  # instead of the one from the branding file, or empty or not-set
  # which will hide the button.
 -showSupportUrl:         true
 -showKnownIssuesUrl:     true
--showReleaseNotesUrl:    true
 +showSupportUrl:         false
 +showKnownIssuesUrl:     false
-+showReleaseNotesUrl:    false
+ showReleaseNotesUrl:    false
+-showDonateUrl:          https://kde.org/community/donations/
++#showDonateUrl:         https://kde.org/community/donations/
  
- # If this Url is set to something non-empty, a "donate"
- # button is added to the welcome page alongside the
-@@ -49,7 +49,6 @@
+ # Requirements checking. These are general, generic, things
+ # that are checked. They may not match with the actual requirements
+
+@@ -42,7 +42,6 @@
          - storage
          - ram
          - power

++++++ branding.desc ++++++
--- /var/tmp/diff_new_pack.0L2N4g/_old  2020-07-06 16:27:30.562834074 +0200
+++ /var/tmp/diff_new_pack.0L2N4g/_new  2020-07-06 16:27:30.562834074 +0200
@@ -1,6 +1,98 @@
+# Product branding information. This influences some global
+# user-visible aspects of Calamares, such as the product
+# name, window behavior, and the slideshow during installation.
+#
+# Additional styling can be done using the stylesheet.qss
+# file, also in the branding directory.
 ---
 componentName:  default
 
+
+# This selects between different welcome texts. When false, uses
+# the traditional "Welcome to the %1 installer.", and when true,
+# uses "Welcome to the Calamares installer for %1." This allows
+# to distinguish this installer from other installers for the
+# same distribution.
+welcomeStyleCalamares:   false
+
+# Should the welcome image (productWelcome, below) be scaled
+# up beyond its natural size? If false, the image does not grow
+# with the window but remains the same size throughout (this
+# may have surprising effects on HiDPI monitors).
+welcomeExpandingLogo:   true
+
+# Size and expansion policy for Calamares.
+#  - "normal" or unset, expand as needed, use *windowSize*
+#  - "fullscreen", start as large as possible, ignore *windowSize*
+#  - "noexpand", don't expand automatically, use *windowSize*
+windowExpanding:    normal
+
+# Size of Calamares window, expressed as w,h. Both w and h
+# may be either pixels (suffix px) or font-units (suffix em).
+#   e.g.    "800px,600px"
+#           "60em,480px"
+# This setting is ignored if "fullscreen" is selected for
+# *windowExpanding*, above. If not set, use constants defined
+# in CalamaresUtilsGui, 800x520.
+windowSize: 800px,520px
+
+# Placement of Calamares window. Either "center" or "free".
+# Whether "center" actually works does depend on the window
+# manager in use (and only makes sense if you're not using
+# *windowExpanding* set to "fullscreen").
+windowPlacement: center
+
+# Kind of sidebar (panel on the left, showing progress).
+#  - "widget" or unset, use traditional sidebar (logo, items)
+#  - "none", hide it entirely
+#  - "qml", use calamares-sidebar.qml from branding folder
+# In addition, you **may** specify a side, separated by a comma,
+# from the kind. Valid sides are:
+#  - "left" (if not specified, uses this)
+#  - "right"
+#  - "top"
+#  - "bottom"
+# For instance, "widget,right" is valid; so is "qml", which defaults
+# to putting the sidebar on the left. Also valid is "qml,top".
+# While "widget,top" is valid, the widgets code is **not** flexible
+# and results will be terrible.
+sidebar: widget
+
+# Kind of navigation (button panel on the bottom).
+#  - "widget" or unset, use traditional navigation
+#  - "none", hide it entirely
+#  - "qml", use calamares-navigation.qml from branding folder
+# In addition, you **may** specify a side, separated by a comma,
+# from the kind. The same sides are valid as for *sidebar*,
+# except the default is *bottom*.
+navigation: widget
+
+# These are strings shown to the user in the user interface.
+# There is no provision for translating them -- since they
+# are names, the string is included as-is.
+#
+# The four Url strings are the Urls used by the buttons in
+# the welcome screen, and are not shown to the user. Clicking
+# on the "Support" button, for instance, opens the link supportUrl.
+# If a Url is empty, the corresponding button is not shown.
+#
+# bootloaderEntryName is how this installation / distro is named
+# in the boot loader (e.g. in the GRUB menu).
+#
+# These strings support substitution from /etc/os-release
+# if KDE Frameworks 5.58 are available at build-time. When
+# enabled, @{var-name} is replaced by the equivalent value
+# from os-release. All the supported var-names are in all-caps,
+# and are listed on the FreeDesktop.org site,
+#       https://www.freedesktop.org/software/systemd/man/os-release.html
+# Note that ANSI_COLOR and CPE_NAME don't make sense here, and
+# are not supported (the rest are). Remember to quote the string
+# if it contains substitutions, or you'll get YAML exceptions.
+#
+# The *Url* entries are used on the welcome page, and they
+# are visible as buttons there if the corresponding *show* keys
+# are set to "true" (they can also be overridden).
+
 # In comments there is alternative examples for openSUSE or your custom 
appliance variables
 
 strings:
@@ -45,17 +137,74 @@
 #    supportUrl:          http://calamares.io/bugs/
 #    knownIssuesUrl:      http://calamares.io/about/
 #    releaseNotesUrl:     http://calamares.io/about/
+#    donateUrl:           https://kde.org/community/donations/index.php
+
 
+
+# These images are loaded from the branding module directory.
+#
+# productBanner is an optional image, which if present, will be shown
+#       on the welcome page of the application, above the welcome text.
+#       It is intended to have a width much greater than height.
+#       It is displayed at 64px height (also on HiDPI).
+#       Recommended size is 64px tall, and up to 460px wide.
+# productIcon is used as the window icon, and will (usually) be used
+#       by the window manager to represent the application. This image
+#       should be square, and may be displayed by the window manager
+#       as small as 16x16 (but possibly larger).
+# productLogo is used as the logo at the top of the left-hand column
+#       which shows the steps to be taken. The image should be square,
+#       and is displayed at 80x80 pixels (also on HiDPI).
+# productWallpaper is an optional image, which if present, will replace
+#       the normal solid background on every page of the application.
+#       It can be any size and proportion,
+#       and will be tiled to fit the entire window.
+#       For a non-tiled wallpaper, the size should be the same as
+#       the overall window, see *windowSize* above (800x520).
+# productWelcome is shown on the welcome page of the application in
+#       the middle of the window, below the welcome text. It can be
+#       any size and proportion, and will be scaled to fit inside
+#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
+#       Recommended size is 320x150.
+#
+# These filenames can also use substitutions from os-release (see above).
 images:
+  # productBanner:       "banner.png"
     productLogo:         "squid.png"
 # $productIcon appears in left upper corner of installer
     productIcon:         "squid.png"
 # $productWelcome appears in center of welcome screen
     productWelcome:      "languages.png"
 
+
+# The slideshow is displayed during execution steps (e.g. when the
+# installer is actually writing to disk and doing other slow things).
 slideshow:               "show.qml"
+# There are two available APIs for the slideshow:
+#  - 1 (the default) loads the entire slideshow when the installation-
+#      slideshow page is shown and starts the QML then. The QML
+#      is never stopped (after installation is done, times etc.
+#      continue to fire).
+#  - 2 loads the slideshow on startup and calls onActivate() and
+#      onLeave() in the root object. After the installation is done,
+#      the show is stopped (first by calling onLeave(), then destroying
+#      the QML components).
+slideshowAPI: 2
+
 
+# Colors for text and background components.
+#
+#  - sidebarBackground is the background of the sidebar
+#  - sidebarText is the (foreground) text color
+#  - sidebarTextHighlight sets the background of the selected (current) step.
+#    Optional, and defaults to the application palette.
+#  - sidebarSelect is the text color of the selected step.
+#
+# These colors can **also** be set through the stylesheet, if the
+# branding component also ships a stylesheet.qss. Then they are
+# the corresponding CSS attributes of #sidebarApp.
 style:
    sidebarBackground:    "#292F34"
    sidebarText:          "#FFFFFF"
    sidebarTextSelect:    "#292F34"
+   sidebarTextHighlight: "#D35400"

++++++ calamares-3.2.15.tar.gz -> calamares-3.2.25.tar.gz ++++++
++++ 454236 lines of diff (skipped)


Reply via email to