simplify .gitignore file

Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>
Update to 4.20.4 + spec cleanup and modernization
2026-07-31 01:09:59 -03:00 · 2026-07-31 01:09:24 -03:00 · 2026-07-17 09:11:36 +00:00 · 2026-01-17 20:38:30 +00:00 · 2025-10-25 15:49:59 -07:00 · 2025-07-25 20:48:28 +00:00
4 changed files with 73 additions and 64 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,26 +1 @@
-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
+/xfce4-session-*.tar.bz2
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xfce4-session-4.18.4.tar.bz2) = dec5006cf69cd44d39c0923d512bfd07123c923627b33a9f232134468cf8a160e329afcf0e61619e7f9a91a453845cbc55a355b6ca9c02e15f55eb7876c8bfc1
+SHA512 (xfce4-session-4.20.4.tar.bz2) = 35d5081b6bf36b00a4fa8dcf50417430193c6424034fa21b1bc14003ad925bcc94e2e683c9aa61193a36bc6e50d5fa52b5c4d33abb41bcd259695478509d86d9
--- a/xfce-session-4.20-startxfce4.patch
+++ b/xfce-session-4.20-startxfce4.patch
@ -1,11 +1,8 @@
--- a/scripts/startxfce4.in	
-+++ a/scripts/startxfce4.in	
-@@ -108,13 +108,15 @@ then
-   SERVERRC="-- $SERVERRC"
+--- 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 @@
 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}
@ -18,4 +15,3 @@
 -  exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC
 +  exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC vt${tty_num}
 fi
- 
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@ -1,46 +1,49 @@
-%global xfceversion 4.18
+# VCS   https://gitlab.xfce.org/xfce/xfce4-session.git
+
+%global xfceversion 4.20

 Name:           xfce4-session
-Version:        4.18.4
+Version:        4.20.4
 Release:        %autorelease
 Summary:        Xfce session manager

-License:        GPLv2+
+License:        GPL-2.0-or-later
 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
+
 # Patch startxfce4 to keep it on the same vty for logind
 # https://bugzilla.redhat.com/show_bug.cgi?id=1117682
-Patch1:         xfce-session-4.10-startxfce4.patch
+Patch1:         xfce-session-%{xfceversion}-startxfce4.patch

-BuildRequires: make
-BuildRequires:  dbus-devel >= 1.1.0
-BuildRequires:  dbus-glib-devel >= 0.84
-BuildRequires:  glib2-devel >= 2.24.0
-BuildRequires:  libSM-devel
-BuildRequires:  libwnck3-devel >= 3.14
-BuildRequires:  libxfce4ui-devel >= %{xfceversion}
-BuildRequires:  startup-notification-devel
-BuildRequires:  xfce4-panel-devel >= %{xfceversion}
-BuildRequires:  xfconf-devel >= %{xfceversion}
-BuildRequires:  iceauth xrdb xset
-# Build tools
 BuildRequires:  desktop-file-utils
-BuildRequires:  gettext 
+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:  libxslt
-#BuildRequires:  libxml2
-BuildRequires:  systemd-devel >= 195
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libwnck3-devel >= 3.10.0
+BuildRequires:  libxfce4ui-devel >= %{xfceversion}
+BuildRequires:  libxfce4util-devel >= %{xfceversion}
+BuildRequires:  libxfce4windowing-devel >= %{xfceversion}
+BuildRequires:  make
 BuildRequires:  polkit-devel
-BuildRequires:  libtool
-Requires:       iceauth xrdb xset
-Requires:       xfce-polkit >= 0.2-2
-Requires:       systemd >= 195
-# Needed for exo desktop preferred applications
+BuildRequires:  xfconf-devel >= %{xfceversion}
+BuildRequires:  xrdb
+BuildRequires:  xset
+
 Requires:       exo
+Requires:       iceauth
+Requires:       systemd >= 195
+Requires:       xfce-polkit >= 0.2-2
+Requires:       xrdb
+Requires:       xset
 # Need this to pull in the right imsettings in groupinstalls
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1349743
 Suggests:       imsettings-xfce
@ -55,6 +58,17 @@ 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

@ -75,18 +89,37 @@ 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 BUGS ChangeLog NEWS TODO
+%doc AUTHORS ChangeLog NEWS
 %doc doc/FAQ doc/NEWS.pre-4.3 doc/README.Kiosk
-%{_sysconfdir}/xdg/xfce4
-%{_bindir}/*
+%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
 %dir %{_libdir}/xfce4/session/
 %{_libdir}/xfce4/session/xfsm-shutdown-helper
 %{_datadir}/xdg-desktop-portal/xfce-portals.conf
@ -97,5 +130,10 @@ cp -a %{SOURCE2} %{buildroot}%{_datadir}/applications/xfce-mimeapps.list
 %{_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
Author	SHA1	Message	Date
Filipe Rosset	a22fa21340	simplify .gitignore file Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>	2026-07-31 01:09:59 -03:00
Filipe Rosset	be4667e610	Update to 4.20.4 + spec cleanup and modernization Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>	2026-07-31 01:09:24 -03:00
Fedora Release Engineering	b3c3472410	Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild	2026-07-17 09:11:36 +00:00
Fedora Release Engineering	9e1d5b504e	Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild	2026-01-17 20:38:30 +00:00
Kevin Fenzi	289442e370	Update to 4.20.3 Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2025-10-25 15:49:59 -07:00
Fedora Release Engineering	2aab3eab5e	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-25 20:48:28 +00:00
Mukundan Ragavan	2c0fe8ca77	Update to v4.20.2	2025-04-06 12:07:43 -05:00
Fedora Release Engineering	0db29ca337	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-19 15:46:35 +00:00
Kevin Fenzi	4ca63cfb28	Split off the wayland session so it's not installed by default Also, require labwc so it actually works. We could split this into a labwc session and a wayfire session, but given that "Important Notice: Please be aware that the Wayland support in Xfce 4.20 is experimental. It is recommended for advanced users only, as you may encounter bugs and experience incomplete functionality. Proceed with caution!", it's likely advanced users that want wayfire could just set that themselves. We could also just not ship it at all, but that seems not great since upstream is in fact shipping it in 4.20 for advanced users. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2024-12-26 13:00:40 -08:00
Mukundan Ragavan	07e14b59ce	Update to v4.20.0	2024-12-22 08:15:27 -06:00
Miroslav Suchý	0d6995d5d4	convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4	2024-07-26 03:53:04 +02:00
Fedora Release Engineering	53e3f21755	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-20 10:01:05 +00:00