diff --git a/.gitignore b/.gitignore index 47131fd..bb3244e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ gajim-0.13.4.tar.bz2 /gajim-1.1.1.tar.bz2 /gajim-1.1.2.tar.bz2 /gajim-1.1.3.tar.bz2 +/gajim-gajim-1.2.0.tar.bz2 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.spec b/gajim.spec index 06027f7..a40e00b 100644 --- a/gajim.spec +++ b/gajim.spec @@ -2,14 +2,11 @@ Summary: Jabber client written in PyGTK Name: gajim -%global majorver 1.1 -Version: 1.1.3 -Release: 6%{?dist} +Version: 1.2.0 +Release: 1%{?dist} 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://dev.gajim.org/gajim/gajim/-/archive/gajim-%{version}/gajim-gajim-%{version}.tar.bz2 BuildArch: noarch ## Hard requirements @@ -66,7 +63,7 @@ to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, even though it exists with it nicely. %prep -%autosetup -p1 +%autosetup -n gajim-gajim-%{version} -p1 %build %py3_build @@ -89,7 +86,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{appid}. %{_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 @@ -97,6 +93,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{appid}. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Tue Jun 30 2020 Michal Schmidt - 1.2.0-1 +- Upstream release 1.2.0. + * Tue May 26 2020 Miro HronĨok - 1.1.3-6 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 574d3bc..a08dfb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gajim-1.1.3.tar.bz2) = 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac +SHA512 (gajim-gajim-1.2.0.tar.bz2) = d37b4079b7faf936ef5480d14e0a488ef009f6b70289103c43508299c5167f49c4d7194acd2bccecc5467ffb2fa77021fb2416a54b625a813ad6d4d5e7eceb0c