Accepting request 508209 from home:vilene:branches:network

- Update to version 0.16.8:
  * Fix rejoining MUCs after connection loss
  * Fix Groupchat invites
  * Fix encoding problems with newer GnuPG versions
  * Fix old messages randomly reappearing in the chat window
  * Fix some problems with IBB filetransfer
  * Make XEP-0146 Commands opt-in
  * Improve sending messages to your own resources
  * Improve reliability of delivery recipes
  * Many minor bugfixes
- Add gajim-do_not_ship_certificate.patch.in: Do not package
  bundled PEM certificate, use one provided by package
  `ca-certificates-mozilla' instead.
- Remove gajim-0.16.7-default-disable-xep-0146.patch: Not needed
  anymore, patch applied upstream.

OBS-URL: https://build.opensuse.org/request/show/508209
OBS-URL: https://build.opensuse.org/package/show/network/gajim?expand=0&rev=26

gajim-0.16.7-default-disable-xep-0146.patch

@@ -1,26 +0,0 @@
---- a/src/common/commands.py
-+++ b/src/common/commands.py
-@@ -345,9 +345,10 @@ class ConnectionCommands:
-     def __init__(self):
-         # a list of all commands exposed: node -> command class
-         self.__commands = {}
--        for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
--        LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
--            self.__commands[cmdobj.commandnode] = cmdobj
-+        if gajim.config.get('remote_commands'):
-+            for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
-+            LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
-+                self.__commands[cmdobj.commandnode] = cmdobj
- 
-         # a list of sessions; keys are tuples (jid, sessionid, node)
-         self.__sessions = {}
---- a/src/common/config.py
-+++ b/src/common/config.py
-@@ -314,6 +314,7 @@ class Config:
-             'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')],
-             'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')],
-             'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
-+            'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')],
-     }, {})
- 
-     __options_per_key = {

gajim-0.16.7.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d6256cdc544ed15d1a4c81d44810d32c21c19acee167c7fe2deff40f2736215
-size 6004998

gajim-0.16.8.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46d4887857455b6e104d0478735edb51569bfa384578ffb4f4da81f1649b6a32
+size 4465521

gajim-do_not_ship_certificate.patch.in

@@ -0,0 +1,22 @@
+--- gajim-0.16.8/plugins/plugin_installer/plugin_installer.py.orig	2017-06-04 13:59:59.000000000 +0200
++++ gajim-0.16.8/plugins/plugin_installer/plugin_installer.py	2017-07-04 19:15:19.058374436 +0200
+@@ -146,7 +146,7 @@
+         if secure is True and hasattr(ssl, 'create_default_context'):
+             if 'cafile' in inspect.getargspec(ssl.create_default_context).args:
+                 ssl_args['context'] = ssl.create_default_context(
+-                    cafile=self.local_file_path('DST_Root_CA_X3.pem'))
++                    cafile='@TRUSTDIR_STATIC@/DST_Root_CA_X3.pem')
+             else:
+                 log.warning('Your python version does not '
+                             'support HTTPS CA pinning')
+--- gajim-0.16.8/plugins/Makefile.am.orig	2017-06-04 00:39:47.000000000 +0200
++++ gajim-0.16.8/plugins/Makefile.am	2017-07-04 20:00:48.764903471 +0200
+@@ -7,7 +7,7 @@
+ 
+ pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}}
+ 
+-pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png ${p}/*.pem)
++pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png)
+ 
+ nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles))
+ 

gajim.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Jul  4 18:39:06 UTC 2017 - vilene@posteo.net
+
+- Update to version 0.16.8:
+  * Fix rejoining MUCs after connection loss
+  * Fix Groupchat invites
+  * Fix encoding problems with newer GnuPG versions
+  * Fix old messages randomly reappearing in the chat window
+  * Fix some problems with IBB filetransfer
+  * Make XEP-0146 Commands opt-in
+  * Improve sending messages to your own resources
+  * Improve reliability of delivery recipes
+  * Many minor bugfixes
+- Add gajim-do_not_ship_certificate.patch.in: Do not package
+  bundled PEM certificate, use one provided by package
+  `ca-certificates-mozilla' instead.
+- Remove gajim-0.16.7-default-disable-xep-0146.patch: Not needed
+  anymore, patch applied upstream.
+
 -------------------------------------------------------------------
 Mon May 29 10:40:52 UTC 2017 - sor.alexei@meowr.ru
 

gajim.spec

@@ -18,25 +18,27 @@
 
 %define _version 0.16
 Name:           gajim
-Version:        0.16.7
+Version:        0.16.8
 Release:        0
 Summary:        Full-featured XMPP client written in Python and Gtk2
 License:        GPL-3.0
 Group:          Productivity/Networking/Talk/Clients
 Url:            https://gajim.org/
-Source:         https://gajim.org/downloads/%{_version}/%{name}-%{version}.tar.gz
+Source:         https://gajim.org/downloads/%{_version}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM gajim-0.16.7-default-disable-xep-0146.patch bsc#1041163 forenjunkie@chello.at -- Add a config option to activate XEP-0146 commands (commit cb65cfc).
+# PATCH-FIX-OPENSUSE gajim-do_not_ship_certificate.patch.in vilene@posteo.net -- do not package PEM certificate
-Patch0:         gajim-0.16.7-default-disable-xep-0146.patch
+Source1:        gajim-do_not_ship_certificate.patch.in
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
 BuildRequires:  libtool
+BuildRequires:  p11-kit-devel
 BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  python-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(glib-2.0)
+Requires:       ca-certificates-mozilla
 Requires:       dbus-1-python
 Requires:       python-gnupg
 Requires:       python-gtk >= 2.2
@@ -91,9 +93,11 @@ Features:
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i '/^_Keywords/d' data/%{name}.desktop.in.in
 
+# Do not package PEM certificate
+sed 's,@TRUSTDIR_STATIC@,%{trustdir_static},' %{S:1} | patch -F0 -p1 --no-backup-if-mismatch
+
 %build
 export PYTHON=python2
 autoreconf -fi