Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sddm for openSUSE:Factory checked in
at 2024-05-11 18:20:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sddm (Old)
and /work/SRC/openSUSE:Factory/.sddm.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm"
Sat May 11 18:20:21 2024 rev:70 rq:1173074 version:0.21.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2024-04-18
22:11:30.087045556 +0200
+++ /work/SRC/openSUSE:Factory/.sddm.new.1880/sddm.changes 2024-05-11
18:24:14.824876077 +0200
@@ -1,0 +2,5 @@
+Fri May 10 08:07:56 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Drop the empty branding-upstream subpackages (boo#1224063)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sddm.spec ++++++
--- /var/tmp/diff_new_pack.xiAiWz/_old 2024-05-11 18:24:15.708908268 +0200
+++ /var/tmp/diff_new_pack.xiAiWz/_new 2024-05-11 18:24:15.708908268 +0200
@@ -21,8 +21,8 @@
# the only restriction is that the Qt X daemon defaults to run sddm-greeter-qtX
# so that should be treated as a hard requirement. The default flavor builds
# daemon and greeter with Qt 5 while the qt6 flavor builds both with Qt 6:
-# sddm builds sddm, sddm-greeter-qt5, sddm-branding-{upstream,openSUSE}
-# sddm:qt6 builds sddm-qt6, sddm-greeter-qt6, sddm-qt6-branding-upstream
+# sddm builds sddm, sddm-greeter-qt5, sddm-branding-openSUSE
+# sddm:qt6 builds sddm-qt6, sddm-greeter-qt6.
# There is a PR pending (#1790) to build both greeters in one go, but here we
# build them separately to allow separation with _multibuild flavors.
@@ -110,7 +110,6 @@
BuildRequires: update-alternatives
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
-Requires: %{name}-branding = %{version}
Requires: sddm-greeter-qt%{qtver} = %{version}
Requires: xdm
%if %qt6
@@ -144,38 +143,15 @@
BuildArch: noarch
Requires: %{name} = %{version}
Requires: sddm-theme-openSUSE
-%if %qt6
-# Make installcheck happy: There needs to be a direct conflict,
-# not just via sddm-qt6-branding-foo -> sddm-qt6 <-> sddm-branding-foo -> sddm
-Conflicts: sddm-branding
-%else
# See 11-kwin_wayland.conf
Requires: kwin5 >= 5.26.90
Supplements: (plasma5-workspace and branding-openSUSE)
-%endif
Conflicts: %{name}-branding
Provides: %{name}-branding = %{version}
%description branding-openSUSE
This package provides the openSUSE branding for SDDM.
-%package branding-upstream
-Summary: Upstream branding for SDDM (Qt%{qtver})
-Group: System/GUI/KDE
-BuildArch: noarch
-Requires: %{name} = %{version}
-Supplements: (%{name} and branding-upstream)
-%if %qt6
-# Make installcheck happy: There needs to be a direct conflict,
-# not just via sddm-qt6-branding-foo -> sddm-qt6 <-> sddm-branding-foo -> sddm
-Conflicts: sddm-branding
-%endif
-Conflicts: %{name}-branding
-Provides: %{name}-branding = %{version}
-
-%description branding-upstream
-This package provides upstream branding for SDDM.
-
%prep
%autosetup -p1 -n sddm-%{version}
@@ -347,7 +323,7 @@
%{_libdir}/qt%{qtver}/qml/
%{_datadir}/sddm/translations-qt%{qtver}/
-# No openSUSE branding for Qt 6 yet
+# The Plasma 6 branding is supplied by plasma6-workspace
%if !%qt6
%files branding-openSUSE
%license LICENSE*
@@ -356,7 +332,3 @@
%{_prefix}/lib/sddm/sddm.conf.d/11-kwin_wayland.conf
%endif
-%files branding-upstream
-%license LICENSE*
-%doc README*
-
