Accepting request 1045030 from X11:xfce:next

Update to Xfce 4.18

OBS-URL: https://build.opensuse.org/request/show/1045030
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=155

_service

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<services>
-  <service name="obs_scm" mode="disabled">
-    <param name="url">https://git.xfce.org/xfce/xfce4-session</param>
-    <param name="scm">git</param>
-    <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
-    <param name="changesgenerate">enable</param>
-    <param name="changesauthor">maurizio.galli@gmail.com</param>
-    <param name="versionrewrite-pattern">xfce4session(.*)</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-  <service name="tar" mode="disabled"/>
-  <service name="recompress" mode="disabled">
-    <param name="compression">bz2</param>
-    <param name="file">*.tar</param>
-  </service>
-</services>

add-light-locker-support-git.patch

@@ -1,13 +0,0 @@
-diff -rub a/scripts/xflock4 b/scripts/xflock4
---- a/scripts/xflock4	2019-05-04 19:15:26.323290812 +0800
-+++ b/scripts/xflock4	2019-05-04 22:39:08.416197604 +0800
-@@ -32,7 +32,8 @@
-     "$LOCK_CMD" \
-     "xfce4-screensaver-command --lock" \
-     "xscreensaver-command -lock" \
--    "gnome-screensaver-command --lock"
-+    "gnome-screensaver-command --lock" \
-+    "light-locker-command -l"
- do
-     if [ ! -z "$lock_cmd" ]; then
-         $lock_cmd >/dev/null 2>&1 && exit

add-light-locker-support.patch

@@ -1,12 +0,0 @@
-diff -rub a/scripts/xflock4 b/scripts/xflock4
---- a/scripts/xflock4	2019-05-11 04:05:58.000000000 +0800
-+++ b/scripts/xflock4	2019-05-20 18:59:02.025108727 +0800
-@@ -29,7 +29,7 @@
-     "$LOCK_CMD" \
-     "xfce4-screensaver-command --lock" \
-     "xscreensaver-command -lock" \
--    "gnome-screensaver-command --lock"
-+    "light-locker-command -l"
- do
-     if [ ! -z "$lock_cmd" ]; then
-         $lock_cmd >/dev/null 2>&1 && exit

xfce4-session-4.16.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7
-size 875504

xfce4-session-4.18.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38badb500b272012f494543a60a9c0563c381647cc95bed73b68aec0b0b89a7f
+size 853627

xfce4-session.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Thu Dec 22 13:18:02 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
+
+- Update to version 4.18.0
+  * Bump requirements for Xfce 4.18
+  * Translation Updates
+- Remove add-light-locker-support-git.patch and add-light-locker-support.patch
+
+- Update to version 4.17.2
+  * logout-dialog: New Xfconf property "ShowSave" (!29)
+  * bump copyright year to 2022
+
+- Update to version 4.17.1
+  * Translation Updates
+
+- Update to version 4.17.0
+  * settings: Revert type hint change
+  * Check getgrgid(3) return value to avoid crash
+  * build: Fix intltool lock file problem during make distcheck
+  * Remove pre-defined lockers
+  * Refresh list of screensavers (#17)
+  * Do not mind output of screensaver, if successful
+  * Run custom command in a separate shell
+  * Avoid extra pause by redirecting stdin
+  * Update COPYING
+  * Increase switch user timeout (!25)
+  * xflock4: Apply initial delay before running a screensaver/locker (#29)
+  * xflock4: Update copyrights
+  * xflock4: make the script executable
+  * Add labels to inline toolbar buttons
+  * Use correct icon for Close button
+  * Translation Updates
+
 -------------------------------------------------------------------
 Wed Dec 23 01:25:05 UTC 2020 - Maurizio Galli <maurizio.galli@gmail.com>
 

xfce4-session.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xfce4-session
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2020-2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,23 +18,21 @@
 
 %bcond_with git
 Name:           xfce4-session
-Version:        4.16.0
+Version:        4.18.0
 Release:        0
 Summary:        Xfce Session Manager
 License:        GPL-2.0-only
 Group:          System/GUI/XFCE
 URL:            https://docs.xfce.org/xfce/xfce4-session/start
-Source0:        https://archive.xfce.org/src/xfce/xfce4-session/4.16/%{name}-%{version}.tar.bz2
+Source0:        https://archive.xfce.org/src/xfce/xfce4-session/4.18/%{name}-%{version}.tar.bz2
 %if %{with git}
 # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts-git.patch bnc#789057 maurizio.galli@gmail.com-- Adapt upstream sessions script to openSUSE.
 Patch0:         xfce4-session-adapt-session-scripts-git.patch
 # PATCH-FIX-OPENSUSE add-light-locker-support.patch  maurizio.galli@gmail.com -- add light-locker to xflock4 script.
-Patch2:         add-light-locker-support-git.patch
 %else
 # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 gber@opensuse.org -- Adapt upstream sessions script to openSUSE.
 Patch1:         xfce4-session-adapt-session-scripts.patch
 # PATCH-FIX-OPENSUSE add-light-locker-support.patch  -- add light-locker to xflock4 script.
-Patch3:         add-light-locker-support.patch
 %endif
 BuildRequires:  fdupes
 BuildRequires:  iceauth
@@ -45,14 +43,15 @@ BuildRequires:  xfce4-dev-tools
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(dbus-glib-1)
-BuildRequires:  pkgconfig(gmodule-2.0)
+BuildRequires:  pkgconfig(gio-2.0) >= 2.66.0
-BuildRequires:  pkgconfig(gnome-keyring-1)
+BuildRequires:  pkgconfig(gmodule-2.0) >= 2.66.0
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22.0
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.24.0
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(libwnck-3.0) >= 3.10
 BuildRequires:  pkgconfig(libxfce4panel-2.0)
-BuildRequires:  pkgconfig(libxfce4ui-2) >= 4.12.0
+BuildRequires:  pkgconfig(libxfce4ui-2) >= 4.15.1
-BuildRequires:  pkgconfig(libxfce4util-1.0) >= 4.12.0
+BuildRequires:  pkgconfig(libxfce4util-1.0) >= 4.15.2
+BuildRequires:  pkgconfig(libxfconf-0) >= 4.12.0
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.102
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(x11)