diff --git a/0001-Prefer-X11-to-Wayland-GDK-backend.patch b/0001-Prefer-X11-to-Wayland-GDK-backend.patch deleted file mode 100644 index dcceb33..0000000 --- a/0001-Prefer-X11-to-Wayland-GDK-backend.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8a89e70157ce76db498ee539c8b9de4fdf6bb1a2 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Thu, 26 Jul 2018 16:40:10 +0200 -Subject: [PATCH 1/3] Prefer X11 to Wayland GDK backend - -Gtk.StatusIcon is not implemented for Wayland. - -Prefer running with the 'x11' GDK backend, where the status icon works. ---- - gajim/gajim.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gajim/gajim.py b/gajim/gajim.py -index 60e817f2c7..a1585f111b 100644 ---- a/gajim/gajim.py -+++ b/gajim/gajim.py -@@ -50,6 +50,10 @@ def _init_gui(gui): - - - def _init_gtk(): -+ # Prefer x11 to wayland for a working Gtk.StatusIcon -+ if 'GDK_BACKEND' not in os.environ: -+ os.environ['GDK_BACKEND']='x11' -+ - import gi - gi.require_version('GLib', '2.0') - gi.require_version('Gio', '2.0') --- -2.20.1 - diff --git a/0002-setup.cfg-bump-nbxmpp-version.patch b/0002-setup.cfg-bump-nbxmpp-version.patch deleted file mode 100644 index 9bd473a..0000000 --- a/0002-setup.cfg-bump-nbxmpp-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b2afbbc4c1b5afe0a3823e20aac7944422b7a3a8 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Thu, 25 Apr 2019 18:15:35 +0200 -Subject: [PATCH 2/2] setup.cfg: bump nbxmpp version - -gajim requires 0.6.10 since -commit 06ca9b39e16549bf230161e3bde766f4b2443586 ("Raise nbxmpp version") - -Declare the same version in setup.cfg to make the resulting RPM -dependency accurate. ---- - setup.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff -up gajim-1.1.3/setup.cfg.orig gajim-1.1.3/setup.cfg ---- gajim-1.1.3/setup.cfg.orig 2019-04-25 18:26:59.091110491 +0200 -+++ gajim-1.1.3/setup.cfg 2019-04-25 18:27:05.934983807 +0200 -@@ -22,7 +22,7 @@ test_suite = test - install_requires = - cssutils>=1.0.2 - keyring -- nbxmpp>=0.6.9,<0.7.0 -+ nbxmpp>=0.6.10,<0.7.0 - precis-i18n>=1.0.0 - pyOpenSSL>=0.12 - diff --git a/gajim-1.1.3.tar.bz2 b/gajim-1.1.3.tar.bz2 deleted file mode 100644 index 89db982..0000000 Binary files a/gajim-1.1.3.tar.bz2 and /dev/null differ diff --git a/gajim-1.5.4.tar.gz b/gajim-1.5.4.tar.gz new file mode 100644 index 0000000..3dfd8a5 Binary files /dev/null and b/gajim-1.5.4.tar.gz differ diff --git a/gajim.spec b/gajim.spec index c850ae1..cb3240e 100644 --- a/gajim.spec +++ b/gajim.spec @@ -2,14 +2,12 @@ Summary: Jabber client written in PyGTK Name: gajim -%global majorver 1.1 -Version: 1.1.3 -Release: 3 +%global majorver 1.5 +Version: 1.5.4 +Release: 1 License: GPLv3 URL: https://gajim.org/ -Source0: https://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2 -Patch0001: 0001-Prefer-X11-to-Wayland-GDK-backend.patch -Patch0002: 0002-setup.cfg-bump-nbxmpp-version.patch +Source0: https://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.gz BuildArch: noarch ## Hard requirements @@ -82,21 +80,21 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{appid}. %files -f %{name}.lang %license COPYING %doc %{_mandir}/man1/%{name}.1* -%doc %{_mandir}/man1/%{name}-history-manager.1* %doc %{_mandir}/man1/%{name}-remote.1* %{_bindir}/%{name} -%{_bindir}/%{name}-history-manager %{_bindir}/%{name}-remote %{_datadir}/applications/%{appid}.desktop %{_datadir}/metainfo/%{appid}.appdata.xml -%{_datadir}/icons/hicolor/*x*/apps/%{appid}.png %{_datadir}/icons/hicolor/scalable/apps/%{appid}.svg -%{_datadir}/icons/hicolor/symbolic/apps/%{appid}-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/%{appid}-symbolic.svg %{python3_sitelib}/%{name} %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Fri Mar 24 2023 wangkai - 1.5.4-1 +- Update to 1.5.4 + * Mon Dec 13 2021 liweigang - 1.1.3-3 - delete %dist