Update to 3.3.4-unstable

See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_buildrequire_python3_devel

python3-xapps-overrides-2.8.4-1.fc41.x86_64 Required python(abi) = 3.13
python3-xapps-overrides-2.8.4-3.fc41.x86_64 no longer Required python(abi) = 3.13

This was caused by 0f031b1931

The package MUST Require python(abi) = 3.13 because it installs to /usr/lib64/python3.13/site-packages/

.gitignore

@@ -2,3 +2,4 @@
 /xapps-*.src.rpm
 /flags-*.tar.gz
 /flags_1.0.2.tar.xz
+/flags_1.0.4.tar.xz

py3.patch

@@ -1,12 +0,0 @@
---- a/pygobject/meson.build
-+++ b/pygobject/meson.build
-@@ -3,7 +3,7 @@
-     required: true,
- )
- 
--foreach exec : ['python2', 'python3']
-+foreach exec : ['python3']
-     r = run_command(exec, '-c', 'import gi;print(gi._overridesdir)')
- 
-     if r.returncode() == 0
-

sources

@@ -1,2 +1,2 @@
-SHA512 (flags_1.0.2.tar.xz) = 7e71e59c7cb47617ede875fd3d1892cee05df7fab8490beffb0ecba19255ab66db9985379fa6647609146ea551174cec84b20708a244e1b5ab2a83d925b31b9c
-SHA512 (xapps-1.6.10.tar.gz) = 49a7995221319ce0b0877da2417daa59268e879ffa82d1b650de5d5978f5b43d5b5b4f5e09d8e2c83b74f1a2f966e8e2618051bcd034406672f2b039955b1641
+SHA512 (xapps-3.3.4-unstable.tar.gz) = 8a69e549413902f75eb60c1089c86a2d3eb25f6ef016c605e8e8bf623531daf8d47b48720b189010e6dbd595d5250072c77e11c4ab79247dedcf0220e60ff466
+SHA512 (flags_1.0.4.tar.xz) = 303e7a77fb3819c602f59727ea9c9a56486435c5331e7721cac205c1e840d6a2f609f5fdb6b8fa401b1e8b6a32ee3915ef06255ad86d7c3de88842787010e56c

watcher_fix_libexec.patch

@@ -0,0 +1,12 @@
+--- b/meson.build
++++ a/meson.build
+@@ -11,7 +11,7 @@
+ 
+ dbus_services_dir = dependency('dbus-1').get_variable(pkgconfig: 'session_bus_services_dir',
+                                                                 pkgconfig_define: ['datadir', get_option('datadir')])
+-sn_watcher_dir = join_paths(get_option('prefix'), get_option('libdir'), 'xapps')
++sn_watcher_dir = join_paths(get_option('prefix'), get_option('libexecdir'), 'xapps')
+ 
+ cdata = configuration_data()
+ cdata.set_quoted('GETTEXT_PACKAGE', 'xapp')
+

xapps.spec

@@ -1,33 +1,39 @@
-# this is only turned on during transitional periods
+%global upstream_version 3.3.4-unstable
+
 Name:           xapps
-Version:        1.6.10
+Version:        3.3.4^unstable
 Release:        1%{?dist}
 Summary:        Common files for XApp desktop apps
 
-License:        LGPLv2+
+License:        LGPL-3.0-only
 URL:            https://github.com/linuxmint/%{name}
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Source1:        http://packages.linuxmint.com/pool/main/f/flags/flags_1.0.2.tar.xz
-# Patch drops python2 support
-Patch0:         py3.patch
+Source0:        %{url}/archive/%{upstream_version}/%{name}-%{upstream_version}.tar.gz
+Source1:        http://packages.linuxmint.com/pool/main/f/flags/flags_1.0.4.tar.xz
+Patch0:         watcher_fix_libexec.patch
 
+ExcludeArch:    %{ix86}
+
+BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk-doc
 BuildRequires:  gtk3-devel
-BuildRequires:  intltool
+BuildRequires:  gtk-layer-shell-devel
+BuildRequires:  libdbusmenu-gtk3-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libgnomekbd-devel
 BuildRequires:  meson
-BuildRequires:  pygobject3-devel
+BuildRequires:  python3-gobject-devel
+BuildRequires:  python3-devel
 BuildRequires:  vala
 
 Requires:       fpaste
 %if 0%{?fedora}
-Requires:       inxi
+Recommends:     inxi
 %endif
 Requires:       python3-xapps-overrides%{?_isa} = %{version}-%{release}
 Requires:       xdg-utils
+Requires:       xorg-x11-xinit
+Recommends:     switcheroo-control
 Obsoletes:      python2-xapps-overrides < %{version}-%{release}
 
 %description
@@ -54,10 +60,6 @@ Summary:        Python%{python3_version} files for %{name}
 
 Requires:       python3-gobject-base%{?_isa}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-gobject
-
 Provides:       python3-xapps-overrides = %{version}-%{release}
 Provides:       python3-xapps-overrides%{?_isa} = %{version}-%{release}
 
@@ -65,38 +67,44 @@ Provides:       python3-xapps-overrides%{?_isa} = %{version}-%{release}
 Python%{python3_version} files for XApp apps.
 
 %prep
-%autosetup -p1
-tar -xf %{SOURCE1} -C files/usr/share --strip 3
-rm files/usr/share/format
+%autosetup -p1 -n xapp-%{upstream_version}
 
 %build
-%meson -D deprecated_warnings=false
+%meson \
+ --buildtype=debugoptimized \
+ -D deprecated_warnings=false
 %meson_build
 
 %install
 %meson_install
+tar -xf %{SOURCE1} -C %{buildroot}%{_datadir} --strip 3
+rm %{buildroot}%{_datadir}/format
 
-find %buildroot -name '*.la' -exec rm -f {} ';'
+%{_bindir}/desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/xapp-sn-watcher.desktop
 
 %find_lang xapp
 
-%ldconfig_scriptlets
-
-
 %files -f xapp.lang
 %license COPYING
 %doc README.md
+%{_sysconfdir}/xdg/autostart/xapp-sn-watcher.desktop
+%{_sysconfdir}/X11/xinit/xinitrc.d/80xapp-gtk3-module.sh
 %{_bindir}/pastebin
 %{_bindir}/upload-system-info
+%{_bindir}/xapp-gpu-offload
 %{_bindir}/xfce4-set-wallpaper
 %{_libdir}/libxapp.so.*
 %{_libdir}/girepository-1.0/XApp-1.0.typelib
+%{_libdir}/gtk-3.0/modules/libxapp-gtk3-module.so
+%dir %{_libexecdir}/xapps/
+%{_libexecdir}/xapps/xapp-sn-watcher
+%{_datadir}/dbus-1/services/org.x.StatusNotifierWatcher.service
 %{_datadir}/iso-flag-png/
 %{_datadir}/glib-2.0/schemas/org.x.apps.*.xml
 %{_datadir}/icons/hicolor/scalable/*/*.svg
 
 %files mate
-%{_libexecdir}/xapps/
+%{_libexecdir}/xapps/*.py
 %{_datadir}/dbus-1/services/org.mate.panel.applet.MateXAppStatusAppletFactory.service
 %{_datadir}/mate-panel/applets/org.x.MateXAppStatusApplet.mate-panel-applet
 
@@ -114,197 +122,38 @@ find %buildroot -name '*.la' -exec rm -f {} ';'
 %{python3_sitearch}/gi/overrides/__pycache__/XApp.cpython-%{python3_version_nodots}*.py*
 
 %changelog
-* Thu Jan 09 2020 Leigh Scott <leigh123linux@googlemail.com> - 1.6.10-1
-- Update to 1.6.10 release
+* Sat Aug 15 2026 Leigh Scott <leigh123linux@gmail.com> - 3.3.4^unstable-1
+- Update to 3.3.4-unstable
 
-* Thu Jan 09 2020 Leigh Scott <leigh123linux@googlemail.com> - 1.6.9-1
-- Update to 1.6.9 release
+* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 3.3.3^unstable-3
+- Rebuilt for Python 3.15.0b4 ABI change
 
-* Wed Dec 11 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.8-1
-- Update to 1.6.8 release
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3^unstable-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 
-* Tue Dec 10 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.7-1
-- Update to 1.6.7 release
+* Sat Jun 20 2026 Leigh Scott <leigh123linux@gmail.com> - 3.3.3^unstable-1
+- Update to 3.3.3-unstable
 
-* Sat Dec 07 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.6-1
-- Update to 1.6.6 release
+* Tue Jun 16 2026 Leigh Scott <leigh123linux@gmail.com> - 3.3.2^unstable-1
+- Update to 3.3.2-unstable
 
-* Fri Nov 29 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.5-1
-- Update to 1.6.5 release
+* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 3.3.1^unstable-2
+- Rebuilt for Python 3.15
 
-* Thu Nov 28 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.4-1
-- Update to 1.6.4 release
+* Sat May 23 2026 Leigh Scott <leigh123linux@gmail.com> - 3.3.1^unstable-1
+- Update to 3.3.1-unstable
 
-* Tue Nov 26 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.3-1
-- Update to 1.6.3 release
+* Sat Feb 28 2026 Leigh Scott <leigh123linux@gmail.com> - 3.2.2-3
+- Update flags
 
-* Fri Nov 22 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.2-1
-- Update to 1.6.2 release
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 
-* Tue Nov 19 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.1-2
-- Add Mate status applet
+* Fri Jan 09 2026 Leigh Scott <leigh123linux@gmail.com> - 3.2.2-1
+- Update to 3.2.2
 
-* Sat Nov 16 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.6.1-1
-- Update to 1.6.1 release
+* Sat Dec 13 2025 Leigh Scott <leigh123linux@gmail.com> - 3.2.1-1
+- Update to 3.2.1
 
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.4.9-2
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Tue Aug 20 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.4.9-1
-- Update to 1.4.9 release
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.4.8-3
-- Rebuilt for Python 3.8
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 11 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.4.8-1
-- Update to 1.4.8 release
-
-* Sun Jun 23 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.4.7-1
-- Update to 1.4.7 release
-
-* Fri Jun 14 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.4.6-1
-- Update to 1.4.6 release
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Dec 16 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.4.5-1
-- Update to 1.4.5 release
-
-* Tue Nov 27 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.4.4-1
-- Update to 1.4.4 release
-
-* Tue Nov 20 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.4.2-1
-- Update to 1.4.2 release
-
-* Mon Nov 12 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.4.1-1
-- Update to 1.4.1 release
-
-* Mon Nov 05 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-2
-- Add Obsoletes python2-xapps-overrides to main package
-
-* Tue Oct 30 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-1
-- Update to 1.4.0 release
-
-* Sun Oct 07 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.2.2-2
-- Drop EPEL/RHEL support
-- Drop python2 support
-
-* Wed Aug 15 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.2.2-1
-- Update to 1.2.2 release
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.2.1-3
-- Rebuilt for Python 3.7
-
-* Sun Jun 10 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.2.1-2
-- Fix rhbz#1589423
-
-* Sun May 06 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.2.1-1
-- Update to 1.2.1 release
-
-* Mon Apr 16 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.2.0-1
-- Update to 1.2.0 release
-
-* Mon Apr 02 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.0-0.2.20180311gite5ca157
-- Update to latest git
-
-* Fri Mar 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.0-0.1.20180309gitfea3ca8
-- Fix version
-
-* Fri Mar 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.0.5-0.3.20180309gitfea3ca8
-- Update to latest git
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-0.2.20180203git83d0f77
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Feb 05 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.0.5-0.1.20180203git83d0f77
-- Update to latest git
-
-* Sat Nov 25 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.4-13
-- Add a base preferences dialog
-
-* Mon Nov 20 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.4-12
-- Fix Requires for F26
-
-* Thu Nov 16 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.4-11
-- Fix Requires for EPEL7
-
-* Thu Nov 16 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.4-10
-- Fix globbing of __pycache__
-
-* Thu Nov 16 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.4-9
-- Fix Python3 macro again
-
-* Thu Nov 16 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.4-8
-- Fix archful Requires
-
-* Thu Nov 16 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.4-7
-- Fix Python3 macro
-
-* Thu Nov 16 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.4-6
-- Fix build
-
-* Thu Nov 16 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.4-5
-- Adaptions for EPEL7
-
-* Mon Nov 13 2017 Troy Curtis, Jr <troycurtisjr@gmail.com> - 1.0.4-4
-- Have python2-xapps-overrides require xapps instead of the other way around.
-- Use python macros
-
-* Sat Nov 11 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.4-3
-- Add requires python2-gobject-base
-
-* Thu Oct 26 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.4-2
-- build python XApp overrides
-
-* Tue Oct 24 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.4-1
-- update to 1.0.4 release
-
-* Thu Aug 31 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.3-6
-- Preserve mode of files when changing hashbang
-
-* Tue Aug 29 2017 Björn Esser <besser82@fedoraproject.org> - 1.0.3-5
-- Use Python2 on epel
-
-* Mon Aug 28 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.3-4
-- Fix requires for epel
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed May 03 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.3-1
-- update to 1.0.3 release
-- add build requires gtk-doc
-
-* Thu Feb 23 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.2-5
-- Add python3-gobject-base instead of python-gobject-base
-
-* Thu Feb 23 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.2-4
-- Add some upstream fixes
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-2
-- Rebuild for Python 3.6
-
-* Mon Nov 07 2016 Leigh Scott <leigh123linux@googlemail.com> - 1.0.2-1
-- update to 1.0.2 release
-
-* Sat Nov 05 2016 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.3.gita8d5277
-- update to latest git
-
-* Tue Oct 11 2016 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.2.git0f28d18
-- fix review issues
-
-* Sat Oct 08 2016 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.1.git7e7567a
-- first build
+* Wed Nov 12 2025 Leigh Scott <leigh123linux@gmail.com> - 3.2.0-1
+- Update to 3.2.0