Hello community, here is the log from the commit of package calamares for openSUSE:Factory checked in at 2019-11-15 22:37:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calamares (Old) and /work/SRC/openSUSE:Factory/.calamares.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calamares" Fri Nov 15 22:37:52 2019 rev:9 rq:741064 version:3.2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/calamares/calamares.changes 2019-10-07 14:14:04.410896820 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/calamares.changes 2019-11-15 22:37:55.260061054 +0100 @@ -2 +2 @@ -Sun Oct 6 16:39:07 UTC 2019 - opensuse.lietuviu.ka...@gmail.com +Sun Oct 13 08:38:26 UTC 2019 - opensuse.lietuviu.ka...@gmail.com @@ -3,0 +4,51 @@ +- Launch with "pkexec calamares" in openSUSE Tumbleweed, but + launch with "xdg-su -c calamares" in openSUSE Leap 15. + +------------------------------------------------------------------- +Sat Oct 12 13:54:24 UTC 2019 - opensuse.lietuviu.ka...@gmail.com + +- Update 3.2-packages.conf.patch to try remove "dracut-kiwi-live" + package after installation. + +------------------------------------------------------------------- +Fri Oct 11 16:28:34 UTC 2019 - opensuse.lietuviu.ka...@gmail.com + +- Update to Calamares 3.2.15: + - "displaymanager" module now treats "sysconfig" as a regular + entry in the "displaymanagers" list, and the "sysconfigSetup" + key is used as a shorthand to force only that entry in the + list. + - "machineid" module has been re-written in C++ and extended + with a new configuration key to generate urandom pool data. + - "unpackfs" now supports a special "sourcefs" value of file + for copying single files (optionally with renaming) or + directory trees to the target system. + - "unpackfs" now support an "exclude" and "excludeFile" setting + for excluding particular files or patters from unpacking. +- Remove patch 3.2-fix-autologin-config-via-sysconfig.patch + that included in Calamares 3.2.15 upstream. +- Update 3.2.14-unpackfs.conf_Leap15.patch and rename it to + 3.2.15-unpackfs.conf_Leap15.patch +- Update 3.2.14-configuring_autologin_in_sysconfig.patch and + rename it to 3.2.15-configuring_autologin_in_sysconfig.patch + +------------------------------------------------------------------- +Mon Oct 7 17:38:03 UTC 2019 - opensuse.lietuviu.ka...@gmail.com + +- Add upstream patch 3.2-fix-autologin-config-via-sysconfig.patch + to fix regression while configuring autologin in openSUSE + (see https://github.com/calamares/calamares/issues/1253). + +------------------------------------------------------------------- +Tue Oct 1 16:34:53 UTC 2019 - opensuse.lietuviu.ka...@gmail.com + +- Update to Calamares 3.2.14: + - "locale" module no longer recognizes the legacy GeoIP + configuration. This has been deprecated since Calamares 3.2.8 + and is now removed. + - "packagechooser" module can now be custom-labeled in the overall + progress (left-hand column). + - "displaymanager" module now recognizes KDE Plasma 5.17. + - "displaymanager" module now can handle Wayland sessions and can + detect sessions from their .desktop files. + - "unpackfs" now has special handling for sourcefs setting “file”. @@ -8,0 +60,37 @@ +- Update 3.1.4-unpackfs.conf_Leap15.patch and rename it to + 3.2.14-unpackfs.conf_Leap15.patch +- Update 3.1.2-configuring_autologin_in_sysconfig.patch and + rename it to 3.2.14-configuring_autologin_in_sysconfig.patch + +------------------------------------------------------------------- +Mon Sep 30 18:57:02 UTC 2019 - opensuse.lietuviu.ka...@gmail.com + +- Update to Calamares 3.2.13. More about upstream changes: + https://calamares.io/calamares-3.2.13-is-out/ and + https://calamares.io/calamares-3.2.12-is-out/ + +------------------------------------------------------------------- +Sat Jul 27 11:12:15 UTC 2019 - opensuse.lietuviu.ka...@gmail.com + +- Update to Calamares 3.2.11: + - Fix race condition in modules/luksbootkeyfile/main.py + (bnc#1140256, CVE-2019-13178) + - more about upstream changes in 3.2 versions can be found in + https://calamares.io/ and + https://github.com/calamares/calamares/releases + - drop 2.4-services.conf.patch + - update 2.4-bootloader.conf.patch and rename it to + 3.2-bootloader.conf.patch + - update 3.1.11-packages.conf.patch and rename it to + 3.2-packages.conf.patch + - update 3.0-settings.conf.patch and rename it to + 3.2-settings.conf.patch + - update 2.4-removeuser.conf.patch and rename it to + 3.2-removeuser.conf.patch + - update 3.1.1-welcome.conf.patch and rename it to + 3.2-welcome.conf.patch + - update 3.1-show.qml.patch and rename it to + 3.2-show.qml.patch + - Minimum Qt version is Qt 5.7, thus removed support for + openSUSE Leap 42.x + - drop 3.1.4-unpackfs.conf.patch that used for openSUSE Leap 42.x @@ -13 +101 @@ -- use suse_version macro instead of sle_version to makes effects +- use suse_version macro instead of sle_version to make effects Old: ---- 2.4-bootloader.conf.patch 2.4-removeuser.conf.patch 2.4-services.conf.patch 3.0-settings.conf.patch 3.1-show.qml.patch 3.1.1-welcome.conf.patch 3.1.11-packages.conf.patch 3.1.2-configuring_autologin_in_sysconfig.patch 3.1.4-unpackfs.conf.patch 3.1.4-unpackfs.conf_Leap15.patch calamares-3.1.11.tar.gz New: ---- 3.2-bootloader.conf.patch 3.2-packages.conf.patch 3.2-removeuser.conf.patch 3.2-settings.conf.patch 3.2-show.qml.patch 3.2-welcome.conf.patch 3.2.15-configuring_autologin_in_sysconfig.patch 3.2.15-unpackfs.conf_Leap15.patch calamares-3.2.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calamares.spec ++++++ --- /var/tmp/diff_new_pack.Kd2V9A/_old 2019-11-15 22:37:55.932063232 +0100 +++ /var/tmp/diff_new_pack.Kd2V9A/_new 2019-11-15 22:37:55.936063246 +0100 @@ -1,7 +1,7 @@ # # spec file for package calamares # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017, 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ %define _sover 3 Name: calamares -Version: 3.1.11 +Version: 3.2.15 Release: 0 Summary: Installer from a live CD/DVD/USB to disk Group: System/Management @@ -26,30 +26,20 @@ # new generic branding.desc with explanations in comments Source1: branding.desc Source2: %{name}-rpmlintrc -# .desktop file customizations for openSUSE +# .desktop file customizations for openSUSE Leap 15 to use xdg-su 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.1.11-packages.conf.patch -Patch2: 2.4-bootloader.conf.patch -Patch3: 2.4-services.conf.patch -Patch4: 3.0-settings.conf.patch -%if %{?suse_version} >= 1500 -Patch5: 3.1.4-unpackfs.conf_Leap15.patch -%else -Patch5: 3.1.4-unpackfs.conf.patch -%endif -Patch6: 3.1.2-configuring_autologin_in_sysconfig.patch -Patch7: 2.4-removeuser.conf.patch -Patch8: 3.1.1-welcome.conf.patch -Patch9: 3.1-show.qml.patch +Patch1: 3.2-packages.conf.patch +Patch2: 3.2-bootloader.conf.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} -%if %{?suse_version} >= 1500 -BuildRequires: libboost_python3-devel -%else -BuildRequires: boost-devel >= 1.59.0 -%endif -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 3.2 BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: gettext @@ -62,15 +52,16 @@ BuildRequires: kiconthemes-devel BuildRequires: kio-devel BuildRequires: kparts-devel -BuildRequires: kpmcore-devel >= 3.0.2 +BuildRequires: kpmcore-devel >= 3.3 BuildRequires: kservice-devel BuildRequires: libatasmart-devel +BuildRequires: libboost_python3-devel BuildRequires: libpolkit-qt5-1-devel -BuildRequires: libqt5-qtbase-devel >= 5.4 -BuildRequires: libqt5-qtdeclarative-devel >= 5.4 -BuildRequires: libqt5-qtsvg-devel >= 5.4 -BuildRequires: libqt5-qttools-devel >= 5.4 -BuildRequires: libqt5-qtwebengine-devel >= 5.6 +BuildRequires: libqt5-qtbase-devel >= 5.7 +BuildRequires: libqt5-qtdeclarative-devel >= 5.7 +BuildRequires: libqt5-qtsvg-devel >= 5.7 +BuildRequires: libqt5-qttools-devel >= 5.7 +BuildRequires: libqt5-qtwebengine-devel >= 5.7 BuildRequires: parted-devel BuildRequires: pkg-config BuildRequires: python3-devel >= 3.3 @@ -88,11 +79,13 @@ Requires: gawk Requires: gptfdisk Requires: grub2 -Requires: kpmcore >= 3.0.2 +Requires: kpmcore >= 3.3 Requires: ntfsprogs Requires: os-prober Requires: parted -#Requires: polkit +%if 0%{?suse_version} > 1500 +Requires: polkit +%endif Requires: python3 Requires: rsync Requires: shadow @@ -109,17 +102,6 @@ Recommends: ntfs-3g Recommends: reiserfs Recommends: xfsprogs -# C++11 -# Calamares needs at least gcc5 -%if 0%{?sle_version} == 120200 -BuildRequires: gcc5-c++ -%endif -%if 0%{?sle_version} == 120300 -BuildRequires: gcc7-c++ -%endif -%if %{?suse_version} > 1320 -BuildRequires: gcc-c++ >= 5.0 -%endif %ifarch x86_64 # EFI currently only supported on x86_64 Requires: grub2-efi @@ -145,8 +127,12 @@ # This theme is nor pure upstream, nor specific to openSUSE, # but is close to upstream Supplements: packageand(%name:branding-upstream) -#Supplements: packageand(%%{name}:branding-openSUSE) +%if 0%{?sle_version} == 150000 Conflicts: otherproviders(%{name}-branding) +%endif +%if 0%{?suse_version} > 1500 +Conflicts: %{name}-branding +%endif Provides: %name-branding = %{version} BuildArch: noarch @@ -159,10 +145,11 @@ %prep %setup -q -n %{name}-%{version} cp -f %{SOURCE1} src/branding/default/ +%if 0%{?suse_version} == 1500 %patch0 -p1 +%endif %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -173,31 +160,15 @@ find . -wholename "./src/modules/*/main.py" -exec sed -re "1s/^#\!\/usr\/bin\/env python3/#\!\/usr\/bin\/python3/" -i {} \; %build -# Calamares needs at least gcc5 -%if 0%{?sle_version} == 120200 -export CC=gcc-5 -export CXX=g++-5 -%endif -%if 0%{?sle_version} == 120300 -export CC=gcc-7 -export CXX=g++-7 -%endif -%cmake_kf5 -d build -- -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -DSKIP_MODULES="plasmalnf" -DBoost_NO_BOOST_CMAKE=ON +%cmake_kf5 -d build -- -DINSTALL_CONFIG=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -DSKIP_MODULES="plasmalnf" -DBoost_NO_BOOST_CMAKE=ON make %{?_smp_mflags} %install -# Calamares needs at least gcc5 -%if 0%{?sle_version} == 120200 -export CC=gcc-5 -export CXX=g++-5 -%endif -%if 0%{?sle_version} == 120300 -export CC=gcc-7 -export CXX=g++-7 -%endif %kf5_makeinstall -C build # if we don't want polkit (and you want use xdg-su instead) +%if 0%{?suse_version} == 1500 rm -fr %{buildroot}%{_datadir}/polkit-1 +%endif # add executable bits chmod +x %{buildroot}%{_libdir}/%{name}/modules/*/main.py chmod +x %{buildroot}%{_libdir}/%{name}/modules/initramfscfg/encrypt_hook* @@ -209,11 +180,13 @@ rm -f %{buildroot}%{_libdir}/lib%{name}.so rm -f %{buildroot}%{_libdir}/lib%{name}ui.so rm -fr %{buildroot}%{_libdir}/cmake/Calamares/ +# fix exec bits +chmod +x %{buildroot}%{_libdir}/%{name}/modules/unpackfs/runtests.sh %suse_update_desktop_file -r %{name} Qt System PackageManager # localization %find_lang %{name}-python -%find_lang %{name}-dummypythonqt +#%%find_lang %%{name}-dummypythonqt %post %desktop_database_post @@ -227,8 +200,11 @@ # Authors of Calamares already asked to install libs # in the standard search path, see responses of authors in # https://github.com/calamares/calamares/issues/729 -%files -f %{name}-python.lang -f %{name}-dummypythonqt.lang -%doc LICENSE AUTHORS + +%files -f %{name}-python.lang +#%%files -f %%{name}-dummypythonqt.lang +%license LICENSE +%doc AUTHORS %{_mandir}/*/* %{_bindir}/%{name} %{_sysconfdir}/%{name}/ @@ -237,7 +213,9 @@ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg # if we want polkit (you can use xdg-su instead) -#%%{_datadir}/polkit-1/actions/com.github.%%{name}.%%{name}.policy +%if 0%{?suse_version} > 1500 +%{_datadir}/polkit-1/actions/com.github.%{name}.%{name}.policy +%endif %{_libdir}/lib%{name}.so.* %{_libdir}/lib%{name}ui.so.* %dir %{_libdir}/%{name}/ @@ -246,11 +224,12 @@ %exclude %{_libdir}/%{name}/modules/webview/ %files webview +%license LICENSE %{_datadir}/%{name}/modules/webview.conf %{_libdir}/%{name}/modules/webview/ %files branding-upstream -%doc LICENSE +%license LICENSE %{_datadir}/%{name}/settings.conf %dir %{_datadir}/%{name}/branding/ %{_datadir}/%{name}/branding/default/ ++++++ 2.4-bootloader.conf.patch -> 3.2-bootloader.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/2.4-bootloader.conf.patch 2017-10-13 14:20:23.148889585 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/3.2-bootloader.conf.patch 2019-11-15 22:37:54.744059382 +0100 @@ -4,20 +4,18 @@ diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf --- a/src/modules/bootloader/bootloader.conf +++ b/src/modules/bootloader/bootloader.conf -@@ -17,9 +17,13 @@ - - # GRUB 2 binary names and boot directory - # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. +@@ -26,10 +26,10 @@ + # GRUB functionality (notably grub-probe) to work. As needed, you may use + # complete paths like `/usr/bin/efibootmgr` for the executables. + # -grubInstall: "grub-install" -grubMkconfig: "grub-mkconfig" -grubCfg: "/boot/grub/grub.cfg" +-grubProbe: "grub-probe" +grubInstall: "grub2-install" +grubMkconfig: "grub2-mkconfig" +grubCfg: "/boot/grub2/grub.cfg" -+# Some other distributions use grub-* (resp. /boot/grub/) names. -+#grubInstall: "grub-install" -+#grubMkconfig: "grub-mkconfig" -+#grubCfg: "/boot/grub/grub.cfg" - # Optionally set the --bootloader-id to use for EFI. If not set, this defaults - # to the bootloaderEntryName from branding.desc with problematic characters - # replaced. If an efiBootloaderId is specified here, it is taken to already be a ++grubProbe: "grub2-probe" + efiBootMgr: "efibootmgr" + + # Optionally set the bootloader ID to use for EFI. This is passed to ++++++ 3.1.11-packages.conf.patch -> 3.2-packages.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.1.11-packages.conf.patch 2018-07-17 09:42:50.873191056 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/3.2-packages.conf.patch 2019-11-15 22:37:54.912059927 +0100 @@ -12,23 +12,24 @@ -backend: dummy +backend: zypp + # # Often package installation needs an internet connection. - # Since you may allow system installation without a connection @@ -28,7 +28,7 @@ - # list of packages and dependencies); this is done only if there - # is an internet connection. Set *update_db* to true to do so. + # Therefore set also "update_system" to 'true'. + # skip_if_no_internet: false -update_db: true +update_db: false + update_system: false # - # List of maps with package operations such as install or remove. -@@ -125,11 +125,5 @@ +@@ -159,12 +159,6 @@ # of packages, this can lead to a considerable time savings. # operations: - - install: - - vi +- - vi-${LOCALE} - - wget - - binutils - - remove: @@ -37,3 +38,4 @@ - - binutils + - try_remove: + - calamares ++ - dracut-kiwi-live ++++++ 2.4-removeuser.conf.patch -> 3.2-removeuser.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/2.4-removeuser.conf.patch 2017-10-13 14:20:23.256884837 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/3.2-removeuser.conf.patch 2019-11-15 22:37:54.956060069 +0100 @@ -7,8 +7,10 @@ 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 -@@ -1,2 +1,2 @@ +@@ -3,4 +3,4 @@ + # spills into the target system. --- + # Username in the target system to be removed. -username: live +username: linux \ No newline at end of file ++++++ 3.0-settings.conf.patch -> 3.2-settings.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.0-settings.conf.patch 2017-10-13 14:20:23.440876747 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/3.2-settings.conf.patch 2019-11-15 22:37:54.976060134 +0100 @@ -10,7 +10,7 @@ diff --git a/settings.conf b/settings.conf --- a/settings.conf +++ b/settings.conf -@@ -85,16 +82,18 @@ +@@ -112,16 +112,18 @@ # - dracutlukscfg # - plymouthcfg - - initcpiocfg @@ -22,11 +22,11 @@ - displaymanager - networkcfg - hwclock -- - services +- - services-systemd -# - dracut - - initramfs -# - grubcfg -+# - services ++# - services-systemd + - dracut +# - initramfs + - grubcfg @@ -35,12 +35,3 @@ - umount - show: # - webview@owncloud -@@ -116,7 +112,7 @@ - # is shown. - # Default is false. - # YAML: boolean. --prompt-install: false -+prompt-install: true - - # If this is set to true, Calamares will execute all target environment commands in the - # current environment, without chroot. This setting is considered experimental, and it ++++++ 3.1-show.qml.patch -> 3.2-show.qml.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.1-show.qml.patch 2017-10-13 14:20:23.460875868 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/3.2-show.qml.patch 2019-11-15 22:37:55.048060367 +0100 @@ -3,24 +3,25 @@ diff -ur a/src/branding/default/show.qml b/src/branding/default/show.qml --- a/src/branding/default/show.qml +++ b/src/branding/default/show.qml -@@ -22,14 +22,14 @@ - Presentation - { - id: presentation +@@ -28,7 +28,7 @@ + console.log("QML Component (default slideshow) Next slide"); + presentation.goToNextSlide(); + } - +/* Uncomment to enable multiple slides Timer { - interval: 5000 - running: false + id: advanceTimer + interval: 1000 +@@ -36,7 +36,7 @@ repeat: true - onTriggered: presentation.goToNextSlide() + onTriggered: nextSlide() } -- -+ */ +- ++*/ Slide { Image { -@@ -39,6 +39,7 @@ +@@ -46,6 +46,7 @@ fillMode: Image.PreserveAspectFit anchors.centerIn: parent } @@ -28,20 +29,23 @@ Text { anchors.horizontalCenter: background.horizontalCenter anchors.top: background.bottom -@@ -51,8 +52,9 @@ - width: root.width +@@ -58,8 +59,9 @@ + width: presentation.width horizontalAlignment: Text.Center } -+ */ ++*/ } - +/* Uncomment to enable multiple slides Slide { - centeredText: "This is a second Slide element." + centeredText: qsTr("This is a second Slide element.") } -@@ -60,4 +62,5 @@ +@@ -67,7 +69,7 @@ Slide { - centeredText: "This is a third Slide element." + centeredText: qsTr("This is a third Slide element.") } -+ */ - } +- ++*/ + // When this slideshow is loaded as a V1 slideshow, only + // activatedInCalamares is set, which starts the timer (see above). + // ++++++ 3.1.1-welcome.conf.patch -> 3.2-welcome.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.1.1-welcome.conf.patch 2017-10-13 14:20:23.556871648 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/3.2-welcome.conf.patch 2019-11-15 22:37:55.072060445 +0100 @@ -5,8 +5,10 @@ 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 -@@ -1,7 +1,7 @@ - --- +@@ -7,9 +7,9 @@ + # 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 @@ -14,13 +16,13 @@ +showKnownIssuesUrl: false +showReleaseNotesUrl: false - requirements: - requiredStorage: 5.5 -@@ -17,7 +17,6 @@ + # If this Url is set to something non-empty, a "donate" + # button is added to the welcome page alongside the +@@ -49,7 +49,6 @@ - storage - ram - power - - internet - root - screen - # List conditions that must be satisfied (from the list + # List conditions that **must** be satisfied (from the list ++++++ 3.1.2-configuring_autologin_in_sysconfig.patch -> 3.2.15-configuring_autologin_in_sysconfig.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.1.2-configuring_autologin_in_sysconfig.patch 2017-10-13 14:20:23.572870944 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/3.2.15-configuring_autologin_in_sysconfig.patch 2019-11-15 22:37:55.104060549 +0100 @@ -6,9 +6,9 @@ --- a/src/modules/displaymanager/displaymanager.conf +++ b/src/modules/displaymanager/displaymanager.conf -@@ -3,13 +3,7 @@ - #It also sets up autologin, if the feature is enabled in globalstorage. - #The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. +@@ -13,13 +13,7 @@ + # is attempted. You can also list "sysconfig" in this list instead. + # displaymanagers: - - slim - - sddm @@ -17,13 +17,13 @@ - - mdm - - lxdm - - kdm -+ None ++ sysconfig - #Enable the following settings to force a desktop environment in your displaymanager configuration file: - #defaultDesktopEnvironment: -@@ -23,4 +17,4 @@ - - #If true, setup autologin for openSUSE. This only makes sense on openSUSE - #derivatives or other systems where /etc/sysconfig/displaymanager exists. + # Enable the following settings to force a desktop environment + # in your displaymanager configuration file. This will attempt +@@ -55,4 +55,4 @@ + # The preferred way to pick sysconfig is to just list it in the + # *displaymanagers* list (as the only one). + # -sysconfigSetup: false +sysconfigSetup: true ++++++ 3.1.4-unpackfs.conf_Leap15.patch -> 3.2.15-unpackfs.conf_Leap15.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.1.4-unpackfs.conf_Leap15.patch 2019-02-08 12:11:22.393514921 +0100 +++ /work/SRC/openSUSE:Factory/.calamares.new.26869/3.2.15-unpackfs.conf_Leap15.patch 2019-11-15 22:37:55.120060601 +0100 @@ -1,16 +1,28 @@ -Adjust some default settings (default shipped .conf files) for openSUSE and openSUSE based appliances. +Adjust some default settings (default shipped .conf files) for openSUSE Leap 15 +and openSUSE Leap 15 based appliances. diff --git a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf -index 68de113..eb6169f 100644 --- a/src/modules/unpackfs/unpackfs.conf +++ b/src/modules/unpackfs/unpackfs.conf -@@ -33,6 +33,6 @@ +@@ -79,11 +79,14 @@ + # for its destination name, as in the example below. - # You can list filesystem source paths relative to the Calamares run - # directory, if you use -d (this is only useful for testing, though). -- - source: ./example.sqfs -- sourcefs: squashfs -- destination: "" + unpack: +- - source: ../CHANGES +- sourcefs: file +- destination: "/tmp/changes.txt" +- - source: src/qml/calamares/slideshow +- sourcefs: file +- destination: "/tmp/slideshow/" +- exclude: [ "*.qmlc", "qmldir" ] ++ # - source: ../CHANGES ++ # sourcefs: file ++ # destination: "/tmp/changes.txt" + - source: "/run/rootfsbase" + sourcefs: "ext4" + destination: "/" ++ # - source: src/qml/calamares/slideshow ++ # sourcefs: file ++ # destination: "/tmp/slideshow/" ++ # exclude: [ "*.qmlc", "qmldir" ] + # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt ++++++ calamares-3.1.11.tar.gz -> calamares-3.2.15.tar.gz ++++++ ++++ 326684 lines of diff (skipped) ++++++ calamares-desktop-file.patch ++++++ --- /var/tmp/diff_new_pack.Kd2V9A/_old 2019-11-15 22:37:56.856066228 +0100 +++ /var/tmp/diff_new_pack.Kd2V9A/_new 2019-11-15 22:37:56.856066228 +0100 @@ -1,16 +1,17 @@ -* Use xdg-su instead of pkexec. -* Avoid rpmlint warnings about invalid calamares.desktop value "calamares;system;installer": - for locale string list key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as trailing character +* Use xdg-su instead of pkexec in openSUSE Leap 15 (pkexec works in Tumbleweed). +Because if we use pkexec, we get error in openSUSE Leap 15: +QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-root' +No protocol specified +No protocol specified +qt.qpa.screen: QXcbConnection: Could not connect to display :0 +Could not connect to any X display. diff --git a/calamares.desktop b/calamares.desktop --- a/calamares.desktop +++ b/calamares.desktop -@@ -3,9 +3,9 @@ - Version=1.0 - Name=Calamares +@@ -5,7 +5,7 @@ GenericName=System Installer --Keywords=calamares;system;installer -+Keywords=calamares;system;installer; + Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares +Exec=xdg-su -c /usr/bin/calamares ++++++ calamares-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.Kd2V9A/_old 2019-11-15 22:37:56.872066279 +0100 +++ /var/tmp/diff_new_pack.Kd2V9A/_new 2019-11-15 22:37:56.872066279 +0100 @@ -6,7 +6,10 @@ # calamares-libs3.i586: W: shared-lib-calls-exit /usr/lib/libcalamares.so.3.1.1 exit@GLIBC_2.0 addFilter("calamares.*shared-lib-calls-exit /usr/lib.*/libcalamares.*exit@GLIBC.*") -# xdg-utils is among requirements of Calamares. +# Polkit pkexec is among requirements of Calamares for openSUSE Tumbleweed. +addFilter("calamares.*desktopfile-without-binary.*calamares.desktop pkexec") + +# xdg-utils is among requirements of Calamares for openSUSE Leap 15. addFilter("calamares.*desktopfile-without-binary.*calamares.desktop xdg-su") # despide of warning, `desktop-file-validate calamares.desktop` shows no errors
