Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package livecd-openSUSE for openSUSE:Factory
checked in at 2024-03-12 21:03:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "livecd-openSUSE"
Tue Mar 12 21:03:12 2024 rev:225 rq:1157327 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes
2024-02-13 22:44:49.661560590 +0100
+++
/work/SRC/openSUSE:Factory/.livecd-openSUSE.new.1770/livecd-openSUSE.changes
2024-03-12 21:03:13.321846141 +0100
@@ -1,0 +2,17 @@
+Tue Mar 12 19:57:57 UTC 2024 - Fabian Vogt <[email protected]>
+
+- list-kde: Ignore some Qt/Plasma 5 packages and qt6-webengine users
+- common.sh: Force delete qt6-webengine for now
+
+-------------------------------------------------------------------
+Tue Mar 12 12:43:21 UTC 2024 - Dominique Leuenberger <[email protected]>
+
+- Fix tumbleweed live image, following the move to Plasma 6:
+ + Limit installation of plasma5-workspace-branding-openSUSE,
+ phonon4qt5-backend-vlc, plasma-nm5, speech-dispatcher, and
+ opensuse-welcome to distro == leap.
+ + Explicitly add phonon-vlc-qt6 on tumbleweed; allow vlc and
+ vlc-qt on Tumbleweed for Plasma6.
+- config.sh: fdupes /usr/share/licenses
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ livecd-leap-kde.kiwi ++++++
--- /var/tmp/diff_new_pack.Y63KKZ/_old 2024-03-12 21:03:14.341883489 +0100
+++ /var/tmp/diff_new_pack.Y63KKZ/_new 2024-03-12 21:03:14.345883636 +0100
@@ -447,6 +447,13 @@
<package name="patterns-kde-kde"/>
<namedCollection name="kde"/>
<package name="plasma5-workspace-branding-openSUSE"/>
+ <package name="phonon4qt5-backend-vlc"/>
+ <!-- OBS-IgnorePackage: vlc -->
+ <ignore name="vlc"/>
+ <!-- OBS-IgnorePackage: vlc-qt -->
+ <ignore name="vlc-qt"/>
+ <package name="plasma-nm5"/>
+ <package name="opensuse-welcome"/>
<package name="baloo5-tools"/>
<package name="NetworkManager"/>
<!-- OBS-IgnorePackage: libreoffice -->
@@ -504,8 +511,6 @@
<ignore name="oxygen5-icon-theme-large"/>
<!-- OBS-IgnorePackage: plasma5-desktop-emojier -->
<ignore name="plasma5-desktop-emojier"/>
- <package name="plasma-nm5"/>
- <package name="phonon4qt5-backend-vlc"/>
<!-- OBS-IgnorePackage: ispell -->
<ignore name="ispell"/>
<!-- OBS-IgnorePackage: patterns-kde-kde_games -->
@@ -530,29 +535,32 @@
<ignore name="hugin"/>
<!-- OBS-IgnorePackage: icewm -->
<ignore name="icewm"/>
- <!-- OBS-IgnorePackage: kmahjongg-lang -->
- <ignore name="kmahjongg-lang"/>
+ <!-- OBS-IgnorePackage: ksudoku -->
+ <ignore name="ksudoku"/>
+ <!-- OBS-IgnorePackage: kpat -->
+ <ignore name="kpat"/>
+ <!-- OBS-IgnorePackage: kmahjongg -->
+ <ignore name="kmahjongg"/>
<!-- OBS-IgnorePackage: konversation-lang -->
<ignore name="konversation-lang"/>
+ <!-- OBS-IgnorePackage: libKF5Auth5-lang -->
+ <ignore name="libKF5Auth5-lang"/>
<!-- OBS-IgnorePackage: libproxy1-pacrunner-webkit -->
<ignore name="libproxy1-pacrunner-webkit"/>
- <!-- OBS-IgnorePackage: vlc -->
- <ignore name="vlc"/>
- <!-- OBS-IgnorePackage: vlc-qt -->
- <ignore name="vlc-qt"/>
<!-- OBS-IgnorePackage: vlc-lang -->
<ignore name="vlc-lang"/>
<!-- OBS-IgnorePackage: kipi-plugins -->
<ignore name="kipi-plugins"/>
<!-- OBS-IgnorePackage: breeze5-wallpapers -->
<ignore name="breeze5-wallpapers"/>
+ <!-- OBS-IgnorePackage: breeze6-wallpapers -->
+ <ignore name="breeze6-wallpapers"/>
<package name="partitionmanager"/>
<!-- OBS-IgnorePackage: cyrus-sasl -->
<ignore name="cyrus-sasl"/>
<!-- OBS-IgnorePackage: xorg-x11-fonts -->
<ignore name="xorg-x11-fonts"/>
<package name="alsa-firmware"/>
- <package name="opensuse-welcome"/>
<!-- OBS-IgnorePackage: bluedevil5 -->
<ignore name="bluedevil5"/>
</packages>
livecd-leap-xfce.kiwi: same change
livecd-openSUSE.kiwi: same change
livecd-tumbleweed-gnome.kiwi: same change
++++++ livecd-tumbleweed-kde.kiwi ++++++
--- /var/tmp/diff_new_pack.Y63KKZ/_old 2024-03-12 21:03:14.397885540 +0100
+++ /var/tmp/diff_new_pack.Y63KKZ/_new 2024-03-12 21:03:14.401885686 +0100
@@ -446,8 +446,14 @@
<ignore name="ImageMagick"/>
<package name="patterns-kde-kde"/>
<namedCollection name="kde"/>
- <package name="plasma5-workspace-branding-openSUSE"/>
- <package name="baloo5-tools"/>
+ <package name="phonon-vlc-qt6"/>
+ <!-- OBS-IgnorePackage: gtk3-metatheme-breeze -->
+ <ignore name="gtk3-metatheme-breeze"/>
+ <package name="kf6-baloo-tools"/>
+ <!-- OBS-IgnorePackage: libqt5-qttranslations -->
+ <ignore name="libqt5-qttranslations"/>
+ <!-- OBS-IgnorePackage: speech-dispatcher -->
+ <ignore name="speech-dispatcher"/>
<package name="NetworkManager"/>
<!-- OBS-IgnorePackage: libreoffice -->
<ignore name="libreoffice"/>
@@ -495,8 +501,6 @@
<ignore name="oxygen5-icon-theme-large"/>
<!-- OBS-IgnorePackage: plasma5-desktop-emojier -->
<ignore name="plasma5-desktop-emojier"/>
- <package name="plasma-nm5"/>
- <package name="phonon4qt5-backend-vlc"/>
<!-- OBS-IgnorePackage: ispell -->
<ignore name="ispell"/>
<!-- OBS-IgnorePackage: patterns-kde-kde_games -->
@@ -521,29 +525,32 @@
<ignore name="hugin"/>
<!-- OBS-IgnorePackage: icewm -->
<ignore name="icewm"/>
- <!-- OBS-IgnorePackage: kmahjongg-lang -->
- <ignore name="kmahjongg-lang"/>
+ <!-- OBS-IgnorePackage: ksudoku -->
+ <ignore name="ksudoku"/>
+ <!-- OBS-IgnorePackage: kpat -->
+ <ignore name="kpat"/>
+ <!-- OBS-IgnorePackage: kmahjongg -->
+ <ignore name="kmahjongg"/>
<!-- OBS-IgnorePackage: konversation-lang -->
<ignore name="konversation-lang"/>
+ <!-- OBS-IgnorePackage: libKF5Auth5-lang -->
+ <ignore name="libKF5Auth5-lang"/>
<!-- OBS-IgnorePackage: libproxy1-pacrunner-webkit -->
<ignore name="libproxy1-pacrunner-webkit"/>
- <!-- OBS-IgnorePackage: vlc -->
- <ignore name="vlc"/>
- <!-- OBS-IgnorePackage: vlc-qt -->
- <ignore name="vlc-qt"/>
<!-- OBS-IgnorePackage: vlc-lang -->
<ignore name="vlc-lang"/>
<!-- OBS-IgnorePackage: kipi-plugins -->
<ignore name="kipi-plugins"/>
<!-- OBS-IgnorePackage: breeze5-wallpapers -->
<ignore name="breeze5-wallpapers"/>
+ <!-- OBS-IgnorePackage: breeze6-wallpapers -->
+ <ignore name="breeze6-wallpapers"/>
<package name="partitionmanager"/>
<!-- OBS-IgnorePackage: cyrus-sasl -->
<ignore name="cyrus-sasl"/>
<!-- OBS-IgnorePackage: xorg-x11-fonts -->
<ignore name="xorg-x11-fonts"/>
<package name="alsa-firmware"/>
- <package name="opensuse-welcome"/>
<!-- OBS-IgnorePackage: bluedevil5 -->
<ignore name="bluedevil5"/>
</packages>
livecd-tumbleweed-xfce.kiwi: same change
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.Y63KKZ/_old 2024-03-12 21:03:14.469888176 +0100
+++ /var/tmp/diff_new_pack.Y63KKZ/_new 2024-03-12 21:03:14.473888322 +0100
@@ -42,6 +42,13 @@
rpm -e --nodeps noto-coloremoji-fonts || rpm -e --nodeps
google-noto-coloremoji-fonts
fi
+# Make the image smaller, work around a hard dep by plasma6-desktop ->
signon-ui and kdeplasma6-addons
+if rpm -q libQt6WebEngineCore6; then
+ rpm -e --nodeps libQt6WebEngineCore6
+fi
+
+/usr/lib/rpm/fdupes_wrapper /usr/share/licenses
+
#--------------------------------------
# enable and disable services
@@ -57,7 +64,7 @@
echo 'omit_dracutmodules+=" multipath "' >>
/etc/dracut.conf.d/no-multipath.conf
# Stronger compression for the initrd
-echo 'compress="xz -4 --check=crc32 --memlimit-compress=50%"' >>
/etc/dracut.conf.d/less-storage.conf
+echo 'compress="xz -9 --check=crc32 --memlimit-compress=50%"' >>
/etc/dracut.conf.d/less-storage.conf
# Smaller initrd where necessary
if [ "$desktop" = "x11" ] || [ "$desktop" = "xfce" ]; then
++++++ list-kde.sh ++++++
--- /var/tmp/diff_new_pack.Y63KKZ/_old 2024-03-12 21:03:14.545890959 +0100
+++ /var/tmp/diff_new_pack.Y63KKZ/_new 2024-03-12 21:03:14.549891105 +0100
@@ -12,8 +12,31 @@
buildignore ImageMagick
install patterns-kde-kde
installPattern kde
-install plasma5-workspace-branding-openSUSE
-install baloo5-tools
+if [ "$distro" = "leap" ]; then
+ install plasma5-workspace-branding-openSUSE
+ install phonon4qt5-backend-vlc
+ buildignore vlc
+ buildignore vlc-qt
+ install plasma-nm5
+ # From x11_enhanced, but that pattern can't be installed
+ install opensuse-welcome
+ install baloo5-tools
+else
+ install phonon-vlc-qt6
+ buildignore gtk3-metatheme-breeze
+ install kf6-baloo-tools
+ buildignore libqt5-qttranslations
+ buildignore speech-dispatcher
+
+ # Until deleted or replaced by kcm_sddm6
+ buildignore kcm_sddm
+ # Until built against Qt 6
+ buildignore xwaylandvideobridge
+ # Needs WebEngine and we don't install docs on the .iso
+ buildignore khelpcenter
+ # Needs WebEngine and not useful ATM
+ buildignore kaccounts-providers
+fi
install NetworkManager
# Don't add libreoffice for now, too large
buildignore libreoffice
@@ -34,8 +57,6 @@
buildignore plasma5-desktop-emojier
# Resolve have-choice
-install plasma-nm5
-install phonon4qt5-backend-vlc
buildignore ispell
# No fun allowed
@@ -60,16 +81,18 @@
buildignore gdb
buildignore hugin
buildignore icewm
-buildignore kmahjongg-lang
+buildignore ksudoku
+buildignore kpat
+buildignore kmahjongg
buildignore konversation-lang
+buildignore libKF5Auth5-lang
buildignore libproxy1-pacrunner-webkit
-buildignore vlc
-buildignore vlc-qt
buildignore vlc-lang
buildignore kipi-plugins
# Upstream branding, not used by default and HUGE
buildignore breeze5-wallpapers
+buildignore breeze6-wallpapers
install partitionmanager
@@ -81,8 +104,6 @@
# From rest_cd_core
install alsa-firmware
-# From x11_enhanced, but that pattern can't be installed
-install opensuse-welcome
buildignore bluedevil5
++++++ pre-checkin.sh ++++++
--- /var/tmp/diff_new_pack.Y63KKZ/_old 2024-03-12 21:03:14.617893595 +0100
+++ /var/tmp/diff_new_pack.Y63KKZ/_new 2024-03-12 21:03:14.621893742 +0100
@@ -14,8 +14,8 @@
# but https://github.com/openSUSE/obs-build/issues/420 requires a
workaround
## Due to "--ignoreignore--" this has no effect either, so workaround
the workaround
## by using <ignore/>, which gets ignored by OBS completely...
- PACKAGES="$PACKAGES\n <!-- OBS-IgnorePackage: $1 -->"
- PACKAGES="$PACKAGES\n <ignore name=\"$1\"/>"
+ PACKAGES="$PACKAGES\n <!-- OBS-IgnorePackage: $1 -->"
+ PACKAGES="$PACKAGES\n <ignore name=\"$1\"/>"
}
installPattern() {
