diff --git a/.gitignore b/.gitignore index 5c0d629..242d2d0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ /xapps-*.src.rpm /flags-*.tar.gz /flags_1.0.2.tar.xz -/flags_1.0.4.tar.xz diff --git a/sources b/sources index eabb1d5..ac1abb1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xapps-3.3.4-unstable.tar.gz) = 8a69e549413902f75eb60c1089c86a2d3eb25f6ef016c605e8e8bf623531daf8d47b48720b189010e6dbd595d5250072c77e11c4ab79247dedcf0220e60ff466 -SHA512 (flags_1.0.4.tar.xz) = 303e7a77fb3819c602f59727ea9c9a56486435c5331e7721cac205c1e840d6a2f609f5fdb6b8fa401b1e8b6a32ee3915ef06255ad86d7c3de88842787010e56c +SHA512 (flags_1.0.2.tar.xz) = 7e71e59c7cb47617ede875fd3d1892cee05df7fab8490beffb0ecba19255ab66db9985379fa6647609146ea551174cec84b20708a244e1b5ab2a83d925b31b9c +SHA512 (xapps-2.2.8.tar.gz) = eb8da7bd0b5bcdef46ebc5caf7f688eaa3e4a11f4e54dd0f37f006c2f52356bd38d361b35ae7d670cb3e34bb6e9fed8b132d998750e9cd64c110d230437d5636 diff --git a/watcher_fix_libexec.patch b/watcher_fix_libexec.patch deleted file mode 100644 index baa3406..0000000 --- a/watcher_fix_libexec.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/xapps.spec b/xapps.spec index 9765423..712476d 100644 --- a/xapps.spec +++ b/xapps.spec @@ -1,29 +1,26 @@ -%global upstream_version 3.3.4-unstable - Name: xapps -Version: 3.3.4^unstable -Release: 1%{?dist} +Version: 2.2.8 +Release: 2%{?dist} Summary: Common files for XApp desktop apps -License: LGPL-3.0-only +License: LGPLv2+ URL: https://github.com/linuxmint/%{name} -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 +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source1: http://packages.linuxmint.com/pool/main/f/flags/flags_1.0.2.tar.xz ExcludeArch: %{ix86} BuildRequires: desktop-file-utils BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel +BuildRequires: gtk-doc BuildRequires: gtk3-devel -BuildRequires: gtk-layer-shell-devel +BuildRequires: intltool BuildRequires: libdbusmenu-gtk3-devel BuildRequires: libX11-devel BuildRequires: libgnomekbd-devel BuildRequires: meson -BuildRequires: python3-gobject-devel -BuildRequires: python3-devel +BuildRequires: pygobject3-devel BuildRequires: vala Requires: fpaste @@ -33,7 +30,6 @@ 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 @@ -60,6 +56,10 @@ 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} @@ -67,12 +67,10 @@ Provides: python3-xapps-overrides%{?_isa} = %{version}-%{release} Python%{python3_version} files for XApp apps. %prep -%autosetup -p1 -n xapp-%{upstream_version} +%autosetup -p1 -n xapp-%{version} %build -%meson \ - --buildtype=debugoptimized \ - -D deprecated_warnings=false +%meson -D deprecated_warnings=false %meson_build %install @@ -84,6 +82,9 @@ rm %{buildroot}%{_datadir}/format %find_lang xapp +%ldconfig_scriptlets + + %files -f xapp.lang %license COPYING %doc README.md @@ -91,13 +92,12 @@ 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/xapp-sn-watcher +%{_libexecdir}/xapps/sn-watcher/ %{_datadir}/dbus-1/services/org.x.StatusNotifierWatcher.service %{_datadir}/iso-flag-png/ %{_datadir}/glib-2.0/schemas/org.x.apps.*.xml @@ -122,38 +122,287 @@ rm %{buildroot}%{_datadir}/format %{python3_sitearch}/gi/overrides/__pycache__/XApp.cpython-%{python3_version_nodots}*.py* %changelog -* Sat Aug 15 2026 Leigh Scott - 3.3.4^unstable-1 -- Update to 3.3.4-unstable +* Sat Jan 22 2022 Fedora Release Engineering - 2.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Wed Jul 22 2026 Python Maint - 3.3.3^unstable-3 -- Rebuilt for Python 3.15.0b4 ABI change +* Sat Jan 01 2022 Leigh Scott - 2.2.8-1 +- Update to 2.2.8 release -* Fri Jul 17 2026 Fedora Release Engineering - 3.3.3^unstable-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild +* Mon Dec 06 2021 Leigh Scott - 2.2.6-1 +- Update to 2.2.6 release -* Sat Jun 20 2026 Leigh Scott - 3.3.3^unstable-1 -- Update to 3.3.3-unstable +* Wed Nov 24 2021 Leigh Scott - 2.2.5-1 +- Update to 2.2.5 release -* Tue Jun 16 2026 Leigh Scott - 3.3.2^unstable-1 -- Update to 3.3.2-unstable +* Thu Nov 04 2021 Leigh Scott - 2.2.4-1 +- Update to 2.2.4 release -* Wed Jun 03 2026 Python Maint - 3.3.1^unstable-2 -- Rebuilt for Python 3.15 +* Fri Jul 23 2021 Fedora Release Engineering - 2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Sat May 23 2026 Leigh Scott - 3.3.1^unstable-1 -- Update to 3.3.1-unstable +* Fri Jun 25 2021 Leigh Scott - 2.2.2-1 +- Update to 2.2.2 release -* Sat Feb 28 2026 Leigh Scott - 3.2.2-3 -- Update flags +* Thu Jun 10 2021 Leigh Scott - 2.2.1-1 +- Update to 2.2.1 release -* Sat Jan 17 2026 Fedora Release Engineering - 3.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild +* Fri Jun 04 2021 Python Maint - 2.2.0-2 +- Rebuilt for Python 3.10 -* Fri Jan 09 2026 Leigh Scott - 3.2.2-1 -- Update to 3.2.2 +* Fri May 28 2021 Leigh Scott - 2.2.0-1 +- Update to 2.2.0 release -* Sat Dec 13 2025 Leigh Scott - 3.2.1-1 -- Update to 3.2.1 +* Mon Apr 26 2021 Leigh Scott - 2.0.7-1 +- Update to 2.0.7 release -* Wed Nov 12 2025 Leigh Scott - 3.2.0-1 -- Update to 3.2.0 +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 2021 Leigh Scott - 2.0.6-1 +- Update to 2.0.6 release + +* Sat Jan 2 2021 Leigh Scott - 2.0.5-1 +- Update to 2.0.5 release + +* Sun Dec 13 2020 Leigh Scott - 2.0.4-1 +- Update to 2.0.4 release + +* Thu Dec 10 2020 Leigh Scott - 2.0.3-1 +- Update to 2.0.3 release + +* Tue Dec 8 2020 Leigh Scott - 2.0.1-2 +- Add patch to fix perms + +* Tue Dec 8 2020 Leigh Scott - 2.0.1-1 +- Update to 2.0.1 release + +* Wed Nov 25 2020 Leigh Scott - 2.0.0-1 +- Update to 2.0.0 release + +* Wed Sep 9 2020 Leigh Scott - 1.8.10-1 +- Update to 1.8.10 release + +* Sat Aug 15 2020 Leigh Scott - 1.8.9-1 +- Update to 1.8.9 release + +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Leigh Scott - 1.8.8-1 +- Update to 1.8.8 release + +* Sat Jun 06 2020 Leigh Scott - 1.8.7-1 +- Update to 1.8.7 release + +* Tue May 26 2020 Miro Hrončok - 1.8.6-2 +- Rebuilt for Python 3.9 + +* Sat May 23 2020 Leigh Scott - 1.8.6-1 +- Update to 1.8.6 release + +* Thu May 21 2020 Leigh Scott - 1.8.5-1 +- Update to 1.8.5 release + +* Wed May 13 2020 Leigh Scott - 1.8.4-2 +- Fix sn-watcher issue + +* Tue May 12 2020 Leigh Scott - 1.8.4-1 +- Update to 1.8.4 release + +* Fri Jan 31 2020 Fedora Release Engineering - 1.6.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 09 2020 Leigh Scott - 1.6.10-1 +- Update to 1.6.10 release + +* Thu Jan 09 2020 Leigh Scott - 1.6.9-1 +- Update to 1.6.9 release + +* Wed Dec 11 2019 Leigh Scott - 1.6.8-1 +- Update to 1.6.8 release + +* Tue Dec 10 2019 Leigh Scott - 1.6.7-1 +- Update to 1.6.7 release + +* Sat Dec 07 2019 Leigh Scott - 1.6.6-1 +- Update to 1.6.6 release + +* Fri Nov 29 2019 Leigh Scott - 1.6.5-1 +- Update to 1.6.5 release + +* Thu Nov 28 2019 Leigh Scott - 1.6.4-1 +- Update to 1.6.4 release + +* Tue Nov 26 2019 Leigh Scott - 1.6.3-1 +- Update to 1.6.3 release + +* Fri Nov 22 2019 Leigh Scott - 1.6.2-1 +- Update to 1.6.2 release + +* Tue Nov 19 2019 Leigh Scott - 1.6.1-2 +- Add Mate status applet + +* Sat Nov 16 2019 Leigh Scott - 1.6.1-1 +- Update to 1.6.1 release + +* Thu Oct 03 2019 Miro Hrončok - 1.4.9-2 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Tue Aug 20 2019 Leigh Scott - 1.4.9-1 +- Update to 1.4.9 release + +* Mon Aug 19 2019 Miro Hrončok - 1.4.8-3 +- Rebuilt for Python 3.8 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 11 2019 Leigh Scott - 1.4.8-1 +- Update to 1.4.8 release + +* Sun Jun 23 2019 Leigh Scott - 1.4.7-1 +- Update to 1.4.7 release + +* Fri Jun 14 2019 Leigh Scott - 1.4.6-1 +- Update to 1.4.6 release + +* Sun Feb 03 2019 Fedora Release Engineering - 1.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Dec 16 2018 Leigh Scott - 1.4.5-1 +- Update to 1.4.5 release + +* Tue Nov 27 2018 Leigh Scott - 1.4.4-1 +- Update to 1.4.4 release + +* Tue Nov 20 2018 Leigh Scott - 1.4.2-1 +- Update to 1.4.2 release + +* Mon Nov 12 2018 Leigh Scott - 1.4.1-1 +- Update to 1.4.1 release + +* Mon Nov 05 2018 Leigh Scott - 1.4.0-2 +- Add Obsoletes python2-xapps-overrides to main package + +* Tue Oct 30 2018 Leigh Scott - 1.4.0-1 +- Update to 1.4.0 release + +* Sun Oct 07 2018 Leigh Scott - 1.2.2-2 +- Drop EPEL/RHEL support +- Drop python2 support + +* Wed Aug 15 2018 Leigh Scott - 1.2.2-1 +- Update to 1.2.2 release + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 1.2.1-3 +- Rebuilt for Python 3.7 + +* Sun Jun 10 2018 Leigh Scott - 1.2.1-2 +- Fix rhbz#1589423 + +* Sun May 06 2018 Leigh Scott - 1.2.1-1 +- Update to 1.2.1 release + +* Mon Apr 16 2018 Leigh Scott - 1.2.0-1 +- Update to 1.2.0 release + +* Mon Apr 02 2018 Leigh Scott - 1.1.0-0.2.20180311gite5ca157 +- Update to latest git + +* Fri Mar 09 2018 Leigh Scott - 1.1.0-0.1.20180309gitfea3ca8 +- Fix version + +* Fri Mar 09 2018 Leigh Scott - 1.0.5-0.3.20180309gitfea3ca8 +- Update to latest git + +* Fri Feb 09 2018 Fedora Release Engineering - 1.0.5-0.2.20180203git83d0f77 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Feb 05 2018 Leigh Scott - 1.0.5-0.1.20180203git83d0f77 +- Update to latest git + +* Sat Nov 25 2017 Leigh Scott - 1.0.4-13 +- Add a base preferences dialog + +* Mon Nov 20 2017 Leigh Scott - 1.0.4-12 +- Fix Requires for F26 + +* Thu Nov 16 2017 Björn Esser - 1.0.4-11 +- Fix Requires for EPEL7 + +* Thu Nov 16 2017 Björn Esser - 1.0.4-10 +- Fix globbing of __pycache__ + +* Thu Nov 16 2017 Björn Esser - 1.0.4-9 +- Fix Python3 macro again + +* Thu Nov 16 2017 Björn Esser - 1.0.4-8 +- Fix archful Requires + +* Thu Nov 16 2017 Björn Esser - 1.0.4-7 +- Fix Python3 macro + +* Thu Nov 16 2017 Björn Esser - 1.0.4-6 +- Fix build + +* Thu Nov 16 2017 Björn Esser - 1.0.4-5 +- Adaptions for EPEL7 + +* Mon Nov 13 2017 Troy Curtis, Jr - 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 - 1.0.4-3 +- Add requires python2-gobject-base + +* Thu Oct 26 2017 Leigh Scott - 1.0.4-2 +- build python XApp overrides + +* Tue Oct 24 2017 Leigh Scott - 1.0.4-1 +- update to 1.0.4 release + +* Thu Aug 31 2017 Björn Esser - 1.0.3-6 +- Preserve mode of files when changing hashbang + +* Tue Aug 29 2017 Björn Esser - 1.0.3-5 +- Use Python2 on epel + +* Mon Aug 28 2017 Leigh Scott - 1.0.3-4 +- Fix requires for epel + +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed May 03 2017 Leigh Scott - 1.0.3-1 +- update to 1.0.3 release +- add build requires gtk-doc + +* Thu Feb 23 2017 Leigh Scott - 1.0.2-5 +- Add python3-gobject-base instead of python-gobject-base + +* Thu Feb 23 2017 Leigh Scott - 1.0.2-4 +- Add some upstream fixes + +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.0.2-2 +- Rebuild for Python 3.6 + +* Mon Nov 07 2016 Leigh Scott - 1.0.2-1 +- update to 1.0.2 release + +* Sat Nov 05 2016 Leigh Scott - 1.0.0-0.3.gita8d5277 +- update to latest git + +* Tue Oct 11 2016 Leigh Scott - 1.0.0-0.2.git0f28d18 +- fix review issues + +* Sat Oct 08 2016 Leigh Scott - 1.0.0-0.1.git7e7567a +- first build