From 37ab7f1b8523c23a7a3aaec15b22e0218991de30 Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Fri, 22 Dec 2023 10:08:13 +0100 Subject: [PATCH] update to 2.8.1 Signed-off-by: Toshaan Bharvani --- SOURCES/.gitkeeper | 0 SOURCES/watcher_fix_libexec.patch | 12 ++++++ SPECS/xapps.spec | 64 +++++++++++++++++++++++++++++-- 3 files changed, 72 insertions(+), 4 deletions(-) mode change 100644 => 100755 SOURCES/.gitkeeper create mode 100644 SOURCES/watcher_fix_libexec.patch diff --git a/SOURCES/.gitkeeper b/SOURCES/.gitkeeper old mode 100644 new mode 100755 diff --git a/SOURCES/watcher_fix_libexec.patch b/SOURCES/watcher_fix_libexec.patch new file mode 100644 index 0000000..baa3406 --- /dev/null +++ b/SOURCES/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') + diff --git a/SPECS/xapps.spec b/SPECS/xapps.spec index 5d0fb38..bc8273c 100644 --- a/SPECS/xapps.spec +++ b/SPECS/xapps.spec @@ -1,12 +1,13 @@ Name: xapps -Version: 2.2.8 +Version: 2.8.1 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 +Patch0: watcher_fix_libexec.patch ExcludeArch: %{ix86} @@ -30,6 +31,7 @@ Recommends: inxi Requires: python3-xapps-overrides%{?_isa} = %{version}-%{release} Requires: xdg-utils Requires: xorg-x11-xinit +Recommends: switcheroo-control Obsoletes: python2-xapps-overrides < %{version}-%{release} %description @@ -70,7 +72,9 @@ Python%{python3_version} files for XApp apps. %autosetup -p1 -n xapp-%{version} %build -%meson -D deprecated_warnings=false +%meson \ + --buildtype=debugoptimized \ + -D deprecated_warnings=false %meson_build %install @@ -92,12 +96,13 @@ rm %{buildroot}%{_datadir}/format %{_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/sn-watcher/ +%{_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 @@ -122,6 +127,57 @@ rm %{buildroot}%{_datadir}/format %{python3_sitearch}/gi/overrides/__pycache__/XApp.cpython-%{python3_version_nodots}*.py* %changelog +* Tue Dec 05 2023 Leigh Scott - 2.8.1-1 +- Update to 2.8.1 release + +* Sat Nov 25 2023 Leigh Scott - 2.8.0-1 +- Update to 2.8.0 release + +* Tue Jul 25 2023 Leigh Scott - 2.6.1-4 +- Fix meld issue + +* Sat Jul 22 2023 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 15 2023 Python Maint - 2.6.1-2 +- Rebuilt for Python 3.12 + +* Thu Jun 08 2023 Leigh Scott - 2.6.1-1 +- Update to 2.6.1 release + +* Fri Jun 02 2023 Leigh Scott - 2.6.0-2 +- Use recommends switcheroo-control + +* Thu Jun 01 2023 Leigh Scott - 2.6.0-1 +- Update to 2.6.0 release + +* Wed Mar 29 2023 Leigh Scott - 2.4.3-1 +- Update to 2.4.3 release + +* Sat Jan 21 2023 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Nov 18 2022 Leigh Scott - 2.4.1-1 +- Update to 2.4.1 release + +* Sun Jul 24 2022 Leigh Scott - 2.2.14-1 +- Update to 2.2.14 release + +* Sat Jul 23 2022 Fedora Release Engineering - 2.2.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jul 17 2022 Leigh Scott - 2.2.13-1 +- Update to 2.2.13 release + +* Mon Jun 13 2022 Python Maint - 2.2.10-2 +- Rebuilt for Python 3.11 + +* Sat Jun 11 2022 Leigh Scott - 2.2.10-1 +- Update to 2.2.10 release + +* Sat Jan 22 2022 Fedora Release Engineering - 2.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 01 2022 Leigh Scott - 2.2.8-1 - Update to 2.2.8 release