diff --git a/.gitignore b/.gitignore index 208b34d..47131fd 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ gajim-0.13.4.tar.bz2 /gajim-1.1.0.tar.bz2 /gajim-1.1.1.tar.bz2 /gajim-1.1.2.tar.bz2 +/gajim-1.1.3.tar.bz2 diff --git a/0002-setup.cfg-bump-nbxmpp-version.patch b/0002-setup.cfg-bump-nbxmpp-version.patch new file mode 100644 index 0000000..9bd473a --- /dev/null +++ b/0002-setup.cfg-bump-nbxmpp-version.patch @@ -0,0 +1,26 @@ +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 96bdd88..0522adc 100644 --- a/gajim.spec +++ b/gajim.spec @@ -3,12 +3,13 @@ Summary: Jabber client written in PyGTK Name: gajim %global majorver 1.1 -Version: 1.1.2 -Release: 4%{?dist} +Version: 1.1.3 +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 BuildArch: noarch ## Hard requirements @@ -96,6 +97,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{appid}. %{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Thu Apr 25 2019 Michal Schmidt - 1.1.3-1 +- Upstream release 1.1.3. + * Thu Jan 31 2019 Fedora Release Engineering - 1.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index e4f37ba..574d3bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gajim-1.1.2.tar.bz2) = 69c03277ef368c562ebb1567474b39fb8c0e1f9c03196b3c6a81c6749f178b7ab8096264b89f4d33d78729c4d9e3f6baa7fabf1ab0b0742c5330e5685a4be7c4 +SHA512 (gajim-1.1.3.tar.bz2) = 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac