.gitignore

@@ -1 +1,26 @@
-/xfce4-session-*.tar.bz2
+xfce4-session-4.6.2.tar.bz2
+/xfce4-session-4.7.3.tar.bz2
+/xfce4-session-4.8.0.tar.bz2
+/xfce4-session-4.8.1.tar.bz2
+/xfce4-session-4.8.2.tar.bz2
+/xfce4-session-4.8.3.tar.bz2
+/xfce4-session-4.9.0.tar.bz2
+/xfce4-session-4.9.1.tar.bz2
+/xfce4-session-4.9.2.tar.bz2
+/xfce4-session-4.10.0.tar.bz2
+/xfce4-session-4.10.1.tar.bz2
+/xfce4-session-4.12.0.tar.bz2
+/xfce4-session-4.12.1.tar.bz2
+/xfce4-session-4.13.1.tar.bz2
+/xfce4-session-4.13.2.tar.bz2
+/xfce4-session-4.13.3.tar.bz2
+/xfce4-session-4.13.4.tar.bz2
+/xfce4-session-4.14.0.tar.bz2
+/xfce4-session-4.14.1.tar.bz2
+/xfce4-session-4.14.2.tar.bz2
+/xfce4-session-4.16.0.tar.bz2
+/xfce4-session-4.18.0.tar.bz2
+/xfce4-session-4.18.1.tar.bz2
+/xfce4-session-4.18.2.tar.bz2
+/xfce4-session-4.18.3.tar.bz2
+/xfce4-session-4.18.4.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (xfce4-session-4.20.4.tar.bz2) = 35d5081b6bf36b00a4fa8dcf50417430193c6424034fa21b1bc14003ad925bcc94e2e683c9aa61193a36bc6e50d5fa52b5c4d33abb41bcd259695478509d86d9
+SHA512 (xfce4-session-4.18.4.tar.bz2) = dec5006cf69cd44d39c0923d512bfd07123c923627b33a9f232134468cf8a160e329afcf0e61619e7f9a91a453845cbc55a355b6ca9c02e15f55eb7876c8bfc1

xfce-session-4.10-startxfce4.patch

@@ -1,8 +1,11 @@
---- xfce4-session-4.20.0/scripts/startxfce4.in.orig	2024-12-21 15:32:06.924315101 -0600
-+++ xfce4-session-4.20.0/scripts/startxfce4.in	2024-12-21 15:32:23.008373245 -0600
-@@ -142,11 +142,11 @@
+--- a/scripts/startxfce4.in	
++++ a/scripts/startxfce4.in	
+@@ -108,13 +108,15 @@ then
+   SERVERRC="-- $SERVERRC"
  fi
  
++tty_num=$(echo $(tty | grep -o '[0-9]'))
++
  if [ -f $BASEDIR/xinitrc ]; then
 -  exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC
 +  exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC vt${tty_num}
@@ -15,3 +18,4 @@
 -  exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC
 +  exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC vt${tty_num}
  fi
+ 

xfce4-session.spec

@@ -1,49 +1,46 @@
-# VCS   https://gitlab.xfce.org/xfce/xfce4-session.git
-
-%global xfceversion 4.20
+%global xfceversion 4.18
 
 Name:           xfce4-session
-Version:        4.20.4
+Version:        4.18.4
 Release:        %autorelease
 Summary:        Xfce session manager
 
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            http://www.xfce.org/
+#VCS git:git://git.xfce.org/xfce/xfce4-session
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 # Add a xfce-mimeapps.list to allow setting mime handlers for Xfce apps
-Source2:        xfce-mimeapps.list
 
+Source2:        xfce-mimeapps.list
 # Patch startxfce4 to keep it on the same vty for logind
 # https://bugzilla.redhat.com/show_bug.cgi?id=1117682
-Patch1:         xfce-session-%{xfceversion}-startxfce4.patch
+Patch1:         xfce-session-4.10-startxfce4.patch
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gcc
-BuildRequires:  gettext
-BuildRequires:  glib2-devel >= 2.72.0
-BuildRequires:  gtk-layer-shell-devel
-BuildRequires:  gtk3-devel >= 3.24.0
-BuildRequires:  iceauth
-BuildRequires:  intltool
-BuildRequires:  libICE-devel
+BuildRequires: make
+BuildRequires:  dbus-devel >= 1.1.0
+BuildRequires:  dbus-glib-devel >= 0.84
+BuildRequires:  glib2-devel >= 2.24.0
 BuildRequires:  libSM-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libwnck3-devel >= 3.10.0
+BuildRequires:  libwnck3-devel >= 3.14
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
-BuildRequires:  libxfce4util-devel >= %{xfceversion}
-BuildRequires:  libxfce4windowing-devel >= %{xfceversion}
-BuildRequires:  make
-BuildRequires:  polkit-devel
+BuildRequires:  startup-notification-devel
+BuildRequires:  xfce4-panel-devel >= %{xfceversion}
 BuildRequires:  xfconf-devel >= %{xfceversion}
-BuildRequires:  xrdb
-BuildRequires:  xset
-
-Requires:       exo
-Requires:       iceauth
-Requires:       systemd >= 195
+BuildRequires:  iceauth xrdb xset
+# Build tools
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext 
+BuildRequires:  intltool
+BuildRequires:  libxslt
+#BuildRequires:  libxml2
+BuildRequires:  systemd-devel >= 195
+BuildRequires:  polkit-devel
+BuildRequires:  libtool
+Requires:       iceauth xrdb xset
 Requires:       xfce-polkit >= 0.2-2
-Requires:       xrdb
-Requires:       xset
+Requires:       systemd >= 195
+# Needed for exo desktop preferred applications
+Requires:       exo
 # Need this to pull in the right imsettings in groupinstalls
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1349743
 Suggests:       imsettings-xfce
@@ -58,17 +55,6 @@ Obsoletes:      xfce4-session-devel <= 4.13.3
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
 
-%package wayland-session
-Summary:        Wayland session for Xfce
-BuildArch:      noarch
-Requires:       %{name} = %{version}-%{release}
-Requires:       labwc
-
-%description wayland-session
-Wayland session for Xfce. Currently requires labwc.
-Available for testing/advanced users.
-See https://wiki.xfce.org/releng/wayland_roadmap#testing
-
 %prep
 %autosetup -p1
 
@@ -89,37 +75,18 @@ rm -fr %{buildroot}%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-# Remove non-standard hye locale to prevent invalid-lc-messages-dir rpmlint error
-rm -rf %{buildroot}%{_datadir}/locale/hye
-
-# Make xinitrc executable as it has a shebang and is meant to be run
-chmod 755 %{buildroot}%{_sysconfdir}/xdg/xfce4/xinitrc
-
 %find_lang %{name}
 
 # install our xfce-mimeapps.list file to set mime handlers
 mkdir -p %{buildroot}%{_datadir}/applications
 cp -a %{SOURCE2} %{buildroot}%{_datadir}/applications/xfce-mimeapps.list
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/xfce-session-settings.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/xfce4-session-logout.desktop
-
 %files -f %{name}.lang
 %license COPYING
-%doc AUTHORS ChangeLog NEWS
+%doc AUTHORS BUGS ChangeLog NEWS TODO
 %doc doc/FAQ doc/NEWS.pre-4.3 doc/README.Kiosk
-%dir %{_sysconfdir}/xdg/xfce4
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/Xft.xrdb
-%{_sysconfdir}/xdg/xfce4/xinitrc
-%dir %{_sysconfdir}/xdg/xfce4/xfconf
-%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
-%{_bindir}/startxfce4
-%{_bindir}/xfce4-session
-%{_bindir}/xfce4-session-logout
-%{_bindir}/xfce4-session-settings
-%{_bindir}/xflock4
+%{_sysconfdir}/xdg/xfce4
+%{_bindir}/*
 %dir %{_libdir}/xfce4/session/
 %{_libdir}/xfce4/session/xfsm-shutdown-helper
 %{_datadir}/xdg-desktop-portal/xfce-portals.conf
@@ -130,10 +97,5 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/xfce4-session-logout.
 %{_datadir}/polkit-1/actions/org.xfce.session.policy
 %{_mandir}/man1/*
 
-%files wayland-session
-%{_datadir}/wayland-sessions/xfce-wayland.desktop
-%{_datadir}/xfce4/labwc/labwc-environment
-%{_datadir}/xfce4/labwc/labwc-rc.xml
-
 %changelog
 %autochangelog