Accepting request 1223246 from X11:LXQt

- Removed: * lxqt-0.13.0-xdg-config-dir.patch - Update to version 2.1.0: * Pre-release changes (#556) * Weblate commits (#558) * Updated *.ts files (#557) * Weblate commits (#555) * GUI for custom screenlocker on x11 (#517) * Weblate commits (#553) * Updated Luganda (#552) * Weblate commits (#550) * Added scope=dialog to leave window (#551) * Weblate commits (#549) OBS-URL: https://build.opensuse.org/request/show/1223246 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-session?expand=0&rev=33
2024-11-11 12:46:17 +00:00 · 2024-11-11 12:46:17 +00:00 · c7dcd80478
commit c7dcd80478
parent 45694aec67 5f1ce674b6
7 changed files with 67 additions and 51 deletions
--- a/lxqt-0.13.0-xdg-config-dir.patch
+++ b/lxqt-0.13.0-xdg-config-dir.patch
@ -1,26 +0,0 @@
-Added because of: https://bugzilla.suse.com/show_bug.cgi?id=1099800
-This patch was proposed by Simon Quigly and was declined by upstream.
-See discussion at: https://github.com/lxqt/lxqt-session/pull/126/files
-
-From e76f0ebf14b2d54495b3fa27fe751b229b15f6d8 Mon Sep 17 00:00:00 2001
-From: Simon Quigley <tsimonq2@ubuntu.com>
-Date: Fri, 25 May 2018 22:57:21 -0500
-Subject: [PATCH] Ensure all paths are added to $XDG_CONFIG_DIRS.
-
-diff -urEbw lxqt-session-1.1.0/startlxqt.in lxqt-session-1.1.0.new/startlxqt.in
--- lxqt-session-1.1.0/startlxqt.in	2022-04-16 15:16:20.000000000 +0200
-+++ lxqt-session-1.1.0.new/startlxqt.in	2022-04-29 08:02:41.790512998 +0200
-@@ -26,9 +26,11 @@
- if [ -z "$XDG_CONFIG_DIRS" ]; then
-     export XDG_CONFIG_DIRS="@PREDEF_XDG_CONFIG_DIRS@"
- else
-    if ! contains "$XDG_CONFIG_DIRS" '@LXQT_ETC_XDG_DIR@'; then
-        XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@LXQT_ETC_XDG_DIR@"
-+    for directory in "/etc" "@LXQT_ETC_XDG_DIR@" "/usr/share"; do
-+        if ! contains "$XDG_CONFIG_DIRS" "$directory"; then
-+            XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:$directory"
-     fi
-+    done
- fi
- 
- if [ -z "$XDG_CACHE_HOME" ]; then
--- a/lxqt-session-2.0.0.tar.xz
+++ b/lxqt-session-2.0.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74ea3b998fecb50834b8b09952c31a1bf128fde9f7cfdd31284f7397665cb428
-size 194480
--- a/lxqt-session-2.0.0.tar.xz.asc
+++ b/lxqt-session-2.0.0.tar.xz.asc
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmYfsSkVHHRzdWphbjIw
-MDBAZ21haWwuY29tAAoJEL55MAetIt9+laMQAN3sOHCB9p3knxEX+C9H4qWN7rJy
-AGkm3CoGAe38d+FK7zU9Iu0Sl1GwWtj2qnZp8wCGX0k8j9pb/Bu4LTc9vXmMMR2V
-eL9L0tC4jPBm0q+wSxpfi5RbdHdtBlzQ89fBLEchE6vs0TmuWj2rFPxAiktct75b
-+kxIUsshzTHq2BWYBYNv7iAD3wEd/n7gtVD4UqGdpuu51zv+gHLqtp79tD6vHjis
-Tcl/AF+j73J0eg0jcPXSNRWr5wCemEmKCbfM+HGGcnaRMuMxLsTMKz+tBRedcIu+
-i21yGDrtA/TjWVPRtX/Y6rq6SeSe+0v27Q0JsZNHc8Z43zV848M9oJnl61s2ZAOU
-tNM+jHXhuKyGssDBlZ12Gf3NRe6B+NnGdYrcn+ctmEj2HOP0Snv7vQGZSCK0Au9P
-d0DLmPttSckcCYAo+EBsS7RgwmimgJbILqmDT00GCYN4VGY75/kpFk0X+SrlpRTs
-pHwUyIWoRk0JbabjJKJWRQ+ZEI7mZHKJRM8doIBDdGVko/atPNpbUZfdezuYgRF4
-jP+CkeXDB8feTAx/fYOrSDHLqp8JPa73xV69P/e3vfi0QH91X/e+nSyWYm0qleab
-YhFVllR5SqwF0oHuXqDzkRQ3iaTVG0V+c19NgQLilHFPBBzGP1rGSqxMSK+8OJMT
-L6j0yWho9kwYzlkG
-=+rYp
-----END PGP SIGNATURE-----
--- a/lxqt-session-2.1.0.tar.xz
+++ b/lxqt-session-2.1.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b745ef14afec4bed788aeb2d448861fbc0c6f738c1ce956f4a6450f6c745270b
+size 212308
--- a/lxqt-session-2.1.0.tar.xz.asc
+++ b/lxqt-session-2.1.0.tar.xz.asc
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmcpvPgVHHRzdWphbjIw
+MDBAZ21haWwuY29tAAoJEL55MAetIt9+uqQQAI7OGBq/WQ9lBmew93eOX6SmwUHS
+sCGhUGxjCS7/5ttXyyFWJcOPEPK1s8mjlMO3pMAiJeJpqpZ50niy+Umdb+qUVhwA
+UZQymDyiCBBU2nnihLFORDKeF6WK8N7dcaFHYMT8sSxpcpt07rbQIZQPkX2vXQVB
+iPHS5b74mq/Jm81Q4gpucxvmuogDbO+xv4hzRc4sYqZqWQR5bZcnFFSkwt4I3Z5C
+Rx8WUB0dOBjcQPYcUmaDsjqEu8KdheNe34/6jNV6HbsXqDgeA/SfdB9RbRmW3/la
+sHVFU8qWGOeQa0zvs1qqhO7zMvbQdFKsM8G55x/uTxlmi19HJj12mHEBR5oEue++
+4kdl/+7Va9eT7YJ5m6/nG2BNxftGYgQ+aG45p1LmYfu61xXyxwwB5mcTlRKr6rWs
+Vbrt1jDJck4Kf9DXTrwIrQVcEuZsHCQ5QDzqwUanMDr4Yc0VBozGh39eF7SOa+/0
+U36ypjClDVIAUt6kd09QaMwb0o89TUbCHHxlrK1WJgGi/hGb2LqhIbS8dXZcVKmS
+XjP81b9okGU+cD6vr44UIyk3DDNwCIjV5c+F4tioqnW5Ow4EaPiB7+MDWf6pX+RJ
+PsFs1ewxVTfiGlgfvcNIY5NOAe7CQbAfzR9Cyj67lDkuAyz+PB1gGx3vw6lXmB8P
+UCt5R0dwJZcW82M/
+=EK04
+-----END PGP SIGNATURE-----
--- a/lxqt-session.changes
+++ b/lxqt-session.changes
@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Nov 11 00:34:12 UTC 2024 - Shawn Dunn <sfalken@opensuse.org>
+
+- Removed:
+  * lxqt-0.13.0-xdg-config-dir.patch
+
+-------------------------------------------------------------------
+Wed Nov  6 21:37:28 UTC 2024 - Андрей Алыпов <and.november@opensuse.org>
+
+- Update to version 2.1.0:
+  * Pre-release changes (#556)
+  * Weblate commits (#558)
+  * Updated *.ts files (#557)
+  * Weblate commits (#555)
+  * GUI for custom screenlocker on x11 (#517)
+  * Weblate commits (#553)
+  * Updated Luganda (#552)
+  * Weblate commits (#550)
+  * Added scope=dialog to leave window (#551)
+  * Weblate commits (#549)
+
 -------------------------------------------------------------------
 Sat May 11 16:01:52 UTC 2024 - Андрей Алыпов <and.november@opensuse.org>

--- a/lxqt-session.spec
+++ b/lxqt-session.spec
@ -17,7 +17,7 @@


 Name:           lxqt-session
-Version:        2.0.0
+Version:        2.1.0
 Release:        0
 Summary:        LXQt Session Manager
 License:        LGPL-2.1-or-later
@ -26,15 +26,13 @@ URL:            https://github.com/lxqt/lxqt-session
 Source0:        %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
 Source1:        %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
-# FIX-OPENSUSE mvetter@suse.com bsc#1099800
-Patch0:         lxqt-0.13.0-xdg-config-dir.patch
 # mvetter@suse.com bsc#1127043 - Use Openbox as default WM
 Patch1:         %{name}-default_wm.patch
 BuildRequires:  cmake >= 3.18.0
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
-BuildRequires:  qtxdg-tools >= 4.0.0
+BuildRequires:  qtxdg-tools >= 4.1.0
 BuildRequires:  xdg-user-dirs
 BuildRequires:  cmake(KF6WindowSystem)
 BuildRequires:  cmake(LayerShellQt) >= 6.0.0
@ -45,10 +43,11 @@ BuildRequires:  cmake(lxqt2-build-tools)
 BuildRequires:  cmake(qtxdg-tools)
 BuildRequires:  pkgconfig(libproc2) >= 4.0.0
 BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(lxqt) >= 2.0.0
+BuildRequires:  pkgconfig(lxqt) >= 2.1.0
 BuildRequires:  pkgconfig(x11)
 Requires(post): update-alternatives
 Requires(postun):update-alternatives
+Requires:       %{name}-branding = %{version}-%{release}
 Requires:       qtxdg-tools
 Recommends:     %{name}-lang = %{version}-%{release}

@ -60,6 +59,18 @@ use when a user logs out and to restart them the next time the user logs in.

 %lang_package

+%package branding-upstream
+Summary:        Upstream branding of %{name}
+Group:          System/GUI/LXQt
+Requires:       %{name} = %{version}
+Supplements:    (%{name} and branding-upstream)
+Conflicts:      %{name}-branding
+Provides:       %{name}-branding = %{version}
+BuildArch:      noarch
+
+%description branding-upstream
+This package provides the upstream look and feel for %{name}.
+
 %prep
 %autosetup -p1
 sed -i 's/^\(Type=\).*/\1XSession/' xsession/lxqt.desktop.in
@ -72,6 +83,7 @@ sed -i '/^Categories/s/\(LXQt\;\)/X-\1/' lxqt-config-session/lxqt-config-session
 %install
 %{qt6_install}
 %fdupes -s %{buildroot}%{_datadir}
+install -Dm 0644 %{buildroot}%{_datadir}/lxqt/{lxqt,session,windowmanagers,waylandwindowmanagers}.conf -t %{buildroot}%{_sysconfdir}/xdg/lxqt/

 # for default-xsession
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
@ -103,12 +115,21 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi
 %{_datadir}/lxqt/lxqt.conf
 %{_datadir}/lxqt/session.conf
 %{_datadir}/lxqt/windowmanagers.conf
+%{_datadir}/lxqt/waylandwindowmanagers.conf

 # for default-xsession
 %ghost %{_sysconfdir}/alternatives/default-xsession.desktop
 %ghost %{_sysconfdir}/alternatives/default.desktop
 %{_datadir}/xsessions/default.desktop

+%files branding-upstream
+%dir %{_sysconfdir}/xdg/
+%dir %{_sysconfdir}/xdg/lxqt/
+%config %{_sysconfdir}/xdg/lxqt/lxqt.conf
+%config %{_sysconfdir}/xdg/lxqt/session.conf
+%config %{_sysconfdir}/xdg/lxqt/windowmanagers.conf
+%config %{_sysconfdir}/xdg/lxqt/waylandwindowmanagers.conf
+
 %files lang -f %{name}.lang
 %dir %{_datadir}/lxqt
 %dir %{_datadir}/lxqt/translations