- Update to version 1.0.0.

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

gajim-0.16.9.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21b3973676fb04c8b665c83e65377623f321754634d87e3b072f2a7c77fb086c
-size 4469275

gajim-1.0.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:404c5cdcc7b228750d1ae6a226c5402d28705ecd9b147842224036ea6a24aa81
+size 6122718

gajim-do_not_ship_certificate.patch.in

@@ -1,22 +1,11 @@
---- gajim-0.16.8/plugins/plugin_installer/plugin_installer.py.orig	2017-06-04 13:59:59.000000000 +0200
+--- a/gajim/data/plugins/plugin_installer/plugin_installer.py
-+++ gajim-0.16.8/plugins/plugin_installer/plugin_installer.py	2017-07-04 19:15:19.058374436 +0200
++++ b/gajim/data/plugins/plugin_installer/plugin_installer.py
-@@ -146,7 +146,7 @@
+@@ -467,7 +467,7 @@ class DownloadAsync(threading.Thread):
-         if secure is True and hasattr(ssl, 'create_default_context'):
+         ssl_args = {}
-             if 'cafile' in inspect.getargspec(ssl.create_default_context).args:
+         if self.secure:
-                 ssl_args['context'] = ssl.create_default_context(
+             ssl_args['context'] = ssl.create_default_context(
--                    cafile=self.local_file_path('DST_Root_CA_X3.pem'))
+-                cafile=self.plugin.local_file_path('DST_Root_CA_X3.pem'))
-+                    cafile='@TRUSTDIR_STATIC@/DST_Root_CA_X3.pem')
++                cafile='@TRUSTDIR_STATIC@/DST_Root_CA_X3.pem')
-             else:
+         else:
-                 log.warning('Your python version does not '
+             ssl_args['context'] = ssl.create_default_context()
-                             'support HTTPS CA pinning')
+             ssl_args['context'].check_hostname = False
---- 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,36 @@
+-------------------------------------------------------------------
+Mon Mar 17 19:32:02 UTC 2018 - sor.alexei@meowr.ru
+
+- Update to version 1.0.0:
+  * Ported to GTK+3 / Python3.
+  * Integrate HTTPUpload.
+  * Add Navigation buttons in History Window.
+  * Improvements for HiDPI Screens.
+  * Depend on the python keyring package for password storage.
+  * Lots of refactoring.
+  * New Emoji support.
+  * New Chat Window design.
+  * New StartChat Window (Ctrl+N).
+  * New ServerInfo Window.
+  * AccountWindow Redesign.
+  * Move some encryption code out into Plugins (see PGP Plugin,
+    Esessions Plugin).
+  * Add mam:1 and mam:2 support (mam:0 was removed).
+  * Add MAM for MUCs support.
+  * Add support for showing XEP-0084 Avatars.
+  * Add support for geo: URIs.
+  * Add xmpp URI handling directly in Gajim.
+  * Remove Gajim-Remote.
+  * Remove XEP-0012 (Last Activity).
+  * Remove XEP-0136 (Message Archiving).
+  * Add XEP-0156 (Discovering Alternative XMPP Connection Methods).
+  * Add XEP-0319 (Last User Interaction in Presence).
+  * Add XEP-0368 (SRV records for XMPP over TLS).
+  * Add XEP-0380 (Explicit Message Encryption).
+  * Add Jingle FT:5 support.
+  * Lots of other small bugfixes.
+- Rebase gajim-do_not_ship_certificate.patch.in.
+
 -------------------------------------------------------------------
 Wed Dec 13 08:38:47 UTC 2017 - frede@b1-systems.de
 

gajim.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gajim
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,54 +16,52 @@
 #
 
 
-%define _version 0.16
+%define _version 1.0
 Name:           gajim
-Version:        0.16.9
+Version:        1.0.0
 Release:        0
-Summary:        XMPP client written in Python and Gtk2
+Summary:        XMPP client written in Python and Gtk3
-License:        GPL-3.0
+License:        GPL-3.0-only
 Group:          Productivity/Networking/Talk/Clients
 Url:            https://gajim.org/
 Source:         https://gajim.org/downloads/%{_version}/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE gajim-do_not_ship_certificate.patch.in vilene@posteo.net -- do not package PEM certificate
 Source1:        gajim-do_not_ship_certificate.patch.in
-BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires:  fdupes
+BuildRequires:  gobject-introspection-devel
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  intltool
-BuildRequires:  libtool
 BuildRequires:  p11-kit-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python-devel
+BuildRequires:  python3
+BuildRequires:  python3-keyring
+BuildRequires:  python3-nbxmpp >= 0.6.4
+BuildRequires:  python3-setuptools
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(glib-2.0)
 Requires:       ca-certificates-mozilla
-Requires:       dbus-1-python
+Requires:       python3-keyring
-Requires:       python-gnupg
+Requires:       python3-nbxmpp >= 0.6.4
-Requires:       python-gtk >= 2.2
+Requires:       python3-pyOpenSSL >= 0.12
-Requires:       python-nbxmpp >= 0.6.1
+Requires:       python3-pyasn1
-Requires:       python-pyOpenSSL >= 0.12
+Requires:       python3-xml
-Requires:       python-pyasn1
-Requires:       python-xml
 Recommends:     %{name}-lang
 # nslookup for SRV support.
 Recommends:     bind-utils
 Recommends:     gtkspell
 # End-to-end encryption.
-Recommends:     python-pycrypto
+Recommends:     python3-pycrypto
 # zeroconf support.
 Suggests:       dbus-1-glib
-# KWallet support.
-Suggests:       kwalletcli
 # Idle module.
 Suggests:       libXss1
-Suggests:       python-avahi
+Suggests:       python3-avahi
-# Audio/Video Chat
-Suggests:       python-farstream-0_1
-# GNOME Keyring support.
-Suggests:       python-gnomekeyring
 BuildArch:      noarch
+%if 0%{?suse_version} >= 1500
+Requires:       python3-dbus-python
+Requires:       python3-python-gnupg
+%else
+Requires:       dbus-1-python3
+Requires:       python3-gnupg
+%endif
 
 %description
 Gajim is a Jabber/XMPP client. It works with MATE and GNOME, but does
@@ -92,35 +90,28 @@ Features:
 
 %prep
 %setup -q
-sed -i '/^_Keywords/d' data/%{name}.desktop.in.in
+sed -i '/^Keywords/d' data/org.gajim.Gajim.desktop.in
 
 # Do not package PEM certificate
-sed 's,@TRUSTDIR_STATIC@,%{trustdir_static},' %{S:1} | patch -F0 -p1 --no-backup-if-mismatch
+sed 's|@TRUSTDIR_STATIC@|%{trustdir_static}|' %{SOURCE1} | patch -F0 -p1 --no-backup-if-mismatch
+rm gajim/data/plugins/plugin_installer/*.pem
 
 %build
-export PYTHON=python2
+python3 setup.py build
-autoreconf -fi
-%configure \
-  --prefix=%{_prefix}    \
-  --enable-site-packages
-make %{?_smp_mflags} V=1
 
 %install
-%make_install
+python3 setup.py install \
-dirname $(find %{buildroot}%{python_sitelib} -name '*.py') | sort -u | while read dir; do
+  --root=%{buildroot} --prefix=%{_prefix}
-    pushd "$dir"
-    # Fix python-bytecode-inconsistent-mtime (hacky).
-    rm -f *.pyc *.pyo
-    touch -c *.py
-    %py_compile .
-    popd
-done
 
-%suse_update_desktop_file -r %{name} Network InstantMessaging
+mkdir -p %{buildroot}%{_datadir}/
+mv %{buildroot}{%{python3_sitelib}/%{name}/data,%{_datadir}/%{name}}/
+ln -s %{_datadir}/%{name} %{buildroot}%{python3_sitelib}/%{name}/data
+
+%suse_update_desktop_file -r org.gajim.Gajim Network InstantMessaging
 %fdupes %{buildroot}%{_prefix}/
 %find_lang %{name}
 
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} < 1500
 %post
 %desktop_database_post
 %icon_theme_cache_post
@@ -131,16 +122,21 @@ done
 %endif
 
 %files
-%defattr(-,root,root)
+%if 0%{?suse_version} >= 1500
-%doc AUTHORS ChangeLog COPYING README THANKS*
+%license COPYING
+%else
+%doc COPYING
+%endif
 %{_bindir}/%{name}*
 %{_datadir}/%{name}/
-%{python_sitelib}/%{name}/
+%{python3_sitelib}/%{name}/
-%{_datadir}/applications/%{name}*.desktop
+%{python3_sitelib}/%{name}-*
-%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/applications/*%{name}*.desktop
+%{_datadir}/icons/hicolor/*/apps/*%{name}*.*
+%dir %{_datadir}/metainfo/
+%{_datadir}/metainfo/*%{name}*.appdata.xml
 %{_mandir}/man?/%{name}*%{?ext_man}
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %changelog