commit swift-im for openSUSE:Factory

2020-09-15 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2020-09-15 16:30:59

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new.4249 (New)


Package is "swift-im"

Tue Sep 15 16:30:59 2020 rev:14 rq:834531 version:4.0.2

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2020-07-24 
10:00:44.829687222 +0200
+++ /work/SRC/openSUSE:Factory/.swift-im.new.4249/swift-im.changes  
2020-09-15 16:31:16.834768569 +0200
@@ -1,0 +2,6 @@
+Sat Sep 12 17:02:10 UTC 2020 - Christophe Giboudeaux 
+
+- Add upstream patch to fix build with recent Boost versions:
+  * 0001-Avoid-deprecated-boost-endianess-include.patch
+
+---

New:

  0001-Avoid-deprecated-boost-endianess-include.patch



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.1mmD7X/_old  2020-09-15 16:31:18.662770319 +0200
+++ /var/tmp/diff_new_pack.1mmD7X/_new  2020-09-15 16:31:18.666770323 +0200
@@ -36,6 +36,8 @@
 Patch1: swift-im-boost-tribool.patch
 # PATCH-FIX-UPSTREAM
 Patch2: 0001-Fix-build-with-Qt-5.15.patch
+# PATCH-FIX-UPSTREAM
+Patch3: 0001-Avoid-deprecated-boost-endianess-include.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
 BuildRequires:  fdupes

++ 0001-Avoid-deprecated-boost-endianess-include.patch ++
>From c949192306f1690f5cd12ce336853e5ceb4a684f Mon Sep 17 00:00:00 2001
From: Miroslaw Stein 
Date: Fri, 18 Jan 2019 14:30:24 +
Subject: [PATCH] Avoid deprecated boost endianess include

As of Boost 1.69.0, boost/detail/endian.h is deprecated in favour of
boost/predef/other/endian.h, and BOOST_(LITTLE|BIG)_ENDIAN by
BOOST_ENDIAN_(LITTLE|BIG)_BYTE.

Test-Information:

Unit tests pass on Debian 9

Change-Id: If7076c559a4e35219ff97603f50b80cfbe05b29b
---
 Swiften/Base/Platform.h | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Swiften/Base/Platform.h b/Swiften/Base/Platform.h
index 4deba2b..22dff30 100644
--- a/Swiften/Base/Platform.h
+++ b/Swiften/Base/Platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -43,9 +43,9 @@
 #endif
 
 // Endianness
-#include 
-#if defined(BOOST_LITTLE_ENDIAN)
+#include 
+#if defined(BOOST_ENDIAN_LITTLE_BYTE)
 #define SWIFTEN_LITTLE_ENDIAN
-#elif defined(BOOST_BIG_ENDIAN)
+#elif defined(BOOST_ENDIAN_BIG_BYTE)
 #define SWIFTEN_BIG_ENDIAN
 #endif
-- 
2.28.0

commit swift-im for openSUSE:Factory

2020-07-24 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2020-07-24 09:59:15

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new.3592 (New)


Package is "swift-im"

Fri Jul 24 09:59:15 2020 rev:13 rq:822178 version:4.0.2

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2020-06-09 
00:07:50.065965485 +0200
+++ /work/SRC/openSUSE:Factory/.swift-im.new.3592/swift-im.changes  
2020-07-24 10:00:44.829687222 +0200
@@ -1,0 +2,5 @@
+Tue Jul 21 13:26:57 UTC 2020 - Michel Normand 
+
+- Add _constraints for PowerPC avoid "no space left on device" build error
+
+---

New:

  _constraints



Other differences:
--
++ _constraints ++

  

  ppc64
  ppc64le


  
10

commit swift-im for openSUSE:Factory

2020-06-08 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2020-06-09 00:05:49

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new.3606 (New)


Package is "swift-im"

Tue Jun  9 00:05:49 2020 rev:12 rq:812482 version:4.0.2

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2019-04-02 
09:23:15.460748252 +0200
+++ /work/SRC/openSUSE:Factory/.swift-im.new.3606/swift-im.changes  
2020-06-09 00:07:50.065965485 +0200
@@ -1,0 +2,9 @@
+Sat Jun  6 08:00:37 UTC 2020 - Christophe Giboudeaux 
+
+- Update to 4.0.2
+  * Allow setting vCard on servers that do not return an
+empty vCard on fresh accounts
+- Add patch to fix build with Qt 5.15:
+  * 0001-Fix-build-with-Qt-5.15.patch
+
+---

Old:

  swift-4.0.tar.gz
  swift-4.0.tar.gz.asc

New:

  0001-Fix-build-with-Qt-5.15.patch
  swift-4.0.2.tar.gz
  swift-4.0.2.tar.gz.asc



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.A96Ex9/_old  2020-06-09 00:07:52.529974227 +0200
+++ /var/tmp/diff_new_pack.A96Ex9/_new  2020-06-09 00:07:52.533974241 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package swift-im
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -23,17 +23,19 @@
 %define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 
cxxflags='%{optflags}'
 %endif
 Name:   swift-im
-Version:4.0
+Version:4.0.2
 Release:0
 Summary:XMPP client
 License:GPL-3.0-only
 Group:  Productivity/Networking/Talk/Clients
-Url:http://swift.im/
+URL:https://swift.im/
 Source0:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz
 Source1:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz.asc
 Source2:%{name}.keyring
 Patch0: swift-4.0-qt5.11-includes.patch
 Patch1: swift-im-boost-tribool.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Fix-build-with-Qt-5.15.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
 BuildRequires:  fdupes
@@ -106,9 +108,7 @@
 Swiften is a C++ library for implementing XMPP applications.
 
 %prep
-%setup -q -n swift-4.0
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n swift-%{version}
 
 # Remove 3rd party libraries
 # Following ones are used from distro:
@@ -148,15 +148,11 @@
 %fdupes %{buildroot}%{_prefix}
 %suse_update_desktop_file -r %{_name} Network InstantMessaging
 
-%icon_theme_cache_post
-%icon_theme_cache_postun
-
 %post -n libSwiften4 -p /sbin/ldconfig
 %postun -n libSwiften4 -p /sbin/ldconfig
 
 %files
 %license COPYING
-
 %{_bindir}/%{_name}-im
 %{_bindir}/%{_name}-open-uri
 %{_datadir}/applications/%{_name}.desktop

++ 0001-Fix-build-with-Qt-5.15.patch ++
>From 13f7c2778bd5115d5342a8a4bcd0ecc4eca94ce8 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux 
Date: Sat, 6 Jun 2020 10:09:14 +0200
Subject: [PATCH] Fix build with Qt 5.15

---
 Swift/QtUI/Roster/GroupItemDelegate.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Swift/QtUI/Roster/GroupItemDelegate.cpp 
b/Swift/QtUI/Roster/GroupItemDelegate.cpp
index 0356aa0..28af259 100644
--- a/Swift/QtUI/Roster/GroupItemDelegate.cpp
+++ b/Swift/QtUI/Roster/GroupItemDelegate.cpp
@@ -7,6 +7,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
-- 
2.26.2

++ swift-4.0.tar.gz -> swift-4.0.2.tar.gz ++
/work/SRC/openSUSE:Factory/swift-im/swift-4.0.tar.gz 
/work/SRC/openSUSE:Factory/.swift-im.new.3606/swift-4.0.2.tar.gz differ: char 
5, line 1

commit swift-im for openSUSE:Factory

2019-04-02 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2019-04-02 09:23:15

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new.25356 (New)


Package is "swift-im"

Tue Apr  2 09:23:15 2019 rev:11 rq:690391 version:4.0

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2018-06-19 
11:56:13.670596724 +0200
+++ /work/SRC/openSUSE:Factory/.swift-im.new.25356/swift-im.changes 
2019-04-02 09:23:15.460748252 +0200
@@ -1,0 +2,7 @@
+Mon Apr  1 13:34:41 UTC 2019 - mvet...@suse.com
+
+- Add swift-im-boost-tribool.patch: Fix for boost >= 1.69.0
+- Remove deprecated libboost_signals-devel
+  swift-im uses signal2 which is in libboost_headers-devel
+
+---

New:

  swift-im-boost-tribool.patch



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.TqFjcV/_old  2019-04-02 09:23:16.228748767 +0200
+++ /var/tmp/diff_new_pack.TqFjcV/_new  2019-04-02 09:23:16.232748770 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package swift-im
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -33,6 +33,7 @@
 Source1:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz.asc
 Source2:%{name}.keyring
 Patch0: swift-4.0-qt5.11-includes.patch
+Patch1: swift-im-boost-tribool.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
 BuildRequires:  fdupes
@@ -44,7 +45,6 @@
 BuildRequires:  libboost_program_options-devel
 BuildRequires:  libboost_regex-devel
 BuildRequires:  libboost_serialization-devel
-BuildRequires:  libboost_signals-devel
 BuildRequires:  libboost_system-devel
 BuildRequires:  libboost_thread-devel
 BuildRequires:  libminiupnpc-devel
@@ -108,6 +108,7 @@
 %prep
 %setup -q -n swift-4.0
 %patch0 -p1
+%patch1 -p1
 
 # Remove 3rd party libraries
 # Following ones are used from distro:


++ swift-im-boost-tribool.patch ++
>From a2dc74cd0e4891037b97b6a782de80458675e4f0 Mon Sep 17 00:00:00 2001
From: Bruce Stephens 
Date: Wed, 9 Jan 2019 16:21:20 +
Subject: [PATCH] Don't assume that tribool has an implicit bool conversion

In boost 1.68.0 the conversion is implicit, but in 1.69.0 it's
explicit and we must explicitly call it.

Change-Id: I24eb78be7510c89b88342d28c539cad4977f99fd
---
 Swiften/Network/PlatformNATTraversalWorker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp 
b/Swiften/Network/PlatformNATTraversalWorker.cpp
index af1204914f..041ad2defb 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.cpp
+++ b/Swiften/Network/PlatformNATTraversalWorker.cpp
@@ -157,7 +157,7 @@ NATTraversalInterface* 
PlatformNATTraversalWorker::getNATTraversalInterface() co
 miniUPnPInterface = new MiniUPnPInterface();
 miniUPnPSupported = miniUPnPInterface->isAvailable();
 }
-SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported 
<< std::endl;
+SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << 
static_cast(miniUPnPSupported) << std::endl;
 if (miniUPnPSupported) {
 return miniUPnPInterface;
 }
@@ -168,7 +168,7 @@ NATTraversalInterface* 
PlatformNATTraversalWorker::getNATTraversalInterface() co
 natPMPInterface = new NATPMPInterface();
 natPMPSupported = natPMPInterface->isAvailable();
 }
-SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported 
<< std::endl;
+SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << 
static_cast(natPMPSupported) << std::endl;
 if (natPMPSupported) {
 return natPMPInterface;
 }

commit swift-im for openSUSE:Factory

2018-06-19 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2018-06-19 11:56:07

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Tue Jun 19 11:56:07 2018 rev:10 rq:616303 version:4.0

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2018-03-28 
10:32:13.331231323 +0200
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2018-06-19 
11:56:13.670596724 +0200
@@ -1,0 +2,6 @@
+Tue Jun 12 11:39:43 UTC 2018 - mvet...@suse.com
+
+- Add swift-4.0-qt5.11-includes.patch:
+  Add includes explicitly, so it builds with Qt 5.11
+
+---

New:

  swift-4.0-qt5.11-includes.patch



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.BqwWfK/_old  2018-06-19 11:56:14.834553511 +0200
+++ /var/tmp/diff_new_pack.BqwWfK/_new  2018-06-19 11:56:14.838553363 +0200
@@ -32,6 +32,7 @@
 Source0:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz
 Source1:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz.asc
 Source2:%{name}.keyring
+Patch0: swift-4.0-qt5.11-includes.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
 BuildRequires:  fdupes
@@ -106,6 +107,8 @@
 
 %prep
 %setup -q -n swift-4.0
+%patch0 -p1
+
 # Remove 3rd party libraries
 # Following ones are used from distro:
 find 3rdParty/Boost/src -delete

++ swift-4.0-qt5.11-includes.patch ++
diff -urEbwB swift-4.0/Swift/QtUI/UserSearch/QtUserSearchWindow.h 
swift-4.0.new/Swift/QtUI/UserSearch/QtUserSearchWindow.h
--- swift-4.0/Swift/QtUI/UserSearch/QtUserSearchWindow.h2018-03-19 
14:28:55.0 +0100
+++ swift-4.0.new/Swift/QtUI/UserSearch/QtUserSearchWindow.h2018-06-12 
12:01:32.980255186 +0200
@@ -9,6 +9,7 @@
 #include 
 
 #include 
+#include 
 
 #include

commit swift-im for openSUSE:Factory

2018-03-28 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2018-03-28 10:31:46

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Wed Mar 28 10:31:46 2018 rev:9 rq:591144 version:4.0

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2018-03-22 
12:11:41.399537954 +0100
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2018-03-28 
10:32:13.331231323 +0200
@@ -1,0 +2,5 @@
+Thu Mar 22 18:46:52 UTC 2018 - jeng...@inai.de
+
+- Remove filler wording and bias from descriptions.
+
+---



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.sn5USS/_old  2018-03-28 10:32:14.675182988 +0200
+++ /var/tmp/diff_new_pack.sn5USS/_new  2018-03-28 10:32:14.683182699 +0200
@@ -83,29 +83,26 @@
 %endif
 
 %description
-Swift is an easy to setup and use Jabber/XMPP instant messaging chat
-application.
+Swift is a Jabber/XMPP instant messaging chat application.
 
 #  swiften ---
 
 %package -n libSwiften4
-Summary:Cross-platform XMPP client/server library
+Summary:XMPP client/server library
 Group:  System/Libraries
 
 %description -n libSwiften4
-Swiften is a robust, high-quality, standards-compliant, cross-platform,
-and performant C++ library for implementing XMPP applications.
+Swiften is a C++ library for implementing XMPP applications.
 
 # -- swiften-devel ---
 
 %package -n swiften-devel
-Summary:Cross-platform XMPP client/server library (development files)
+Summary:Development files for the Swiften XMPP client/server library
 Group:  Development/Libraries/C and C++
 Requires:   libSwiften4 = %{version}
 
 %description -n swiften-devel
-Swiften is a robust, high-quality, standards-compliant, cross-platform,
-and performant C++ library for implementing XMPP applications.
+Swiften is a C++ library for implementing XMPP applications.
 
 %prep
 %setup -q -n swift-4.0

commit swift-im for openSUSE:Factory

2018-03-22 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2018-03-22 12:07:04

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Thu Mar 22 12:07:04 2018 rev:8 rq:589733 version:4.0

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2018-03-06 
10:47:15.496348483 +0100
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2018-03-22 
12:11:41.399537954 +0100
@@ -1,0 +2,23 @@
+Wed Mar 21 12:07:34 UTC 2018 - mvet...@suse.com
+
+- Add GPG checking
+  * Add swift-4.0.tar.gz.asc
+  * Add swift.keyring
+
+---
+Tue Mar 20 18:27:57 UTC 2018 - mvet...@suse.com
+
+- Update to version 4.0: 
+  * New chat theme including a new font
+  * Support for message carbons (XEP-0280)
+  * Enabled trellis mode as a default feature, allowing several tiled chats 
windows to be shown at once
+  * Redesigned keyword highlighting
+  * Improve date formatting
+  * Fix Last Message Correction in multi client scenarios
+  * Fix UI layout issue for translations that require right-to-left (RTL) 
layout
+  * Fix UX issues in trellis mode
+  * Improvements to font size handling in the chat theme
+  * Improved spell checker support on Linux
+  * And assorted smaller features and usability enhancements
+
+---

Old:

  swift-4.0rc3.tar.gz

New:

  swift-4.0.tar.gz
  swift-4.0.tar.gz.asc
  swift-im.keyring



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.6NLtJs/_old  2018-03-22 12:11:42.951482330 +0100
+++ /var/tmp/diff_new_pack.6NLtJs/_new  2018-03-22 12:11:42.955482186 +0100
@@ -23,13 +23,15 @@
 %define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 
cxxflags='%{optflags}'
 %endif
 Name:   swift-im
-Version:4.0~rc3
+Version:4.0
 Release:0
 Summary:XMPP client
 License:GPL-3.0-only
 Group:  Productivity/Networking/Talk/Clients
 Url:http://swift.im/
-Source0:
http://swift.im/downloads/releases/%{_name}-4.0rc3/%{_name}-4.0rc3.tar.gz
+Source0:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz
+Source1:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz.asc
+Source2:%{name}.keyring
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
 BuildRequires:  fdupes
@@ -106,7 +108,7 @@
 and performant C++ library for implementing XMPP applications.
 
 %prep
-%setup -q -n swift-4.0rc3
+%setup -q -n swift-4.0
 # Remove 3rd party libraries
 # Following ones are used from distro:
 find 3rdParty/Boost/src -delete
@@ -152,7 +154,8 @@
 %postun -n libSwiften4 -p /sbin/ldconfig
 
 %files
-%doc COPYING
+%license COPYING
+
 %{_bindir}/%{_name}-im
 %{_bindir}/%{_name}-open-uri
 %{_datadir}/applications/%{_name}.desktop
@@ -167,11 +170,11 @@
 %{_datadir}/%{_name}/translations/swift_*.qm
 
 %files -n libSwiften4
-%{_prefix}/lib/libSwiften.so.*
+%{_libdir}/libSwiften.so.*
 
 %files -n swiften-devel
 %{_bindir}/swiften-config
 %{_includedir}/Swiften
-%{_prefix}/lib/libSwiften.so
+%{_libdir}/libSwiften.so
 
 %changelog

++ swift-4.0rc3.tar.gz -> swift-4.0.tar.gz ++
/work/SRC/openSUSE:Factory/swift-im/swift-4.0rc3.tar.gz 
/work/SRC/openSUSE:Factory/.swift-im.new/swift-4.0.tar.gz differ: char 5, line 1

commit swift-im for openSUSE:Factory

2018-03-06 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2018-03-06 10:47:15

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Tue Mar  6 10:47:15 2018 rev:7 rq:582602 version:4.0~rc3

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2017-12-14 
11:02:54.051922888 +0100
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2018-03-06 
10:47:15.496348483 +0100
@@ -1,0 +2,5 @@
+Wed Feb 28 20:37:31 UTC 2018 - fi...@opensuse.org
+
+- Altering Swift/QtUI/SConscript is no longer required.
+
+---



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.VFlK54/_old  2018-03-06 10:47:16.532311059 +0100
+++ /var/tmp/diff_new_pack.VFlK54/_new  2018-03-06 10:47:16.536310915 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package swift-im
 #
-# 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
@@ -26,7 +26,7 @@
 Version:4.0~rc3
 Release:0
 Summary:XMPP client
-License:GPL-3.0
+License:GPL-3.0-only
 Group:  Productivity/Networking/Talk/Clients
 Url:http://swift.im/
 Source0:
http://swift.im/downloads/releases/%{_name}-4.0rc3/%{_name}-4.0rc3.tar.gz
@@ -132,8 +132,6 @@
 # Needed for tests
 # find 3rdParty/HippoMocks -delete
 
-sed -e 's:, myenv.File("../../COPYING.thirdparty")::' -i Swift/QtUI/SConscript
-
 %build
 ./scons %{_flags} Swift Swiften %{?_smp_mflags} boost_bundled_enable=false

commit swift-im for openSUSE:Factory

2017-12-14 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2017-12-14 11:02:27

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Thu Dec 14 11:02:27 2017 rev:6 rq:556641 version:4.0~rc3

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2017-11-23 
09:43:53.401661671 +0100
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2017-12-14 
11:02:54.051922888 +0100
@@ -1,0 +2,19 @@
+Tue Dec 12 15:58:46 UTC 2017 - mvet...@suse.com
+
+- Update to version 4RC3:
+  * Fix crash in emoticon dialog
+  * Update translations ( Dutch, German )
+  * And smaller bug fixes
+
+---
+Mon Dec 11 14:58:32 UTC 2017 - mplus...@suse.com
+
+- Use bundled scons for now
+- Drop swift-im-scons-python3.patch
+
+---
+Thu Nov 30 09:35:52 UTC 2017 - mvet...@suse.com
+
+- Convert scons files to use python3
+
+---

Old:

  swift-4.0rc2.tar.gz

New:

  swift-4.0rc3.tar.gz



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.RTrQLU/_old  2017-12-14 11:02:55.803838316 +0100
+++ /var/tmp/diff_new_pack.RTrQLU/_new  2017-12-14 11:02:55.807838123 +0100
@@ -23,13 +23,13 @@
 %define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 
cxxflags='%{optflags}'
 %endif
 Name:   swift-im
-Version:4.0~rc2
+Version:4.0~rc3
 Release:0
 Summary:XMPP client
 License:GPL-3.0
 Group:  Productivity/Networking/Talk/Clients
 Url:http://swift.im/
-Source0:
http://swift.im/downloads/releases/%{_name}-4.0rc2/%{_name}-4.0rc2.tar.gz
+Source0:
http://swift.im/downloads/releases/%{_name}-4.0rc3/%{_name}-4.0rc3.tar.gz
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
 BuildRequires:  fdupes
@@ -45,8 +45,10 @@
 BuildRequires:  libboost_system-devel
 BuildRequires:  libboost_thread-devel
 BuildRequires:  libminiupnpc-devel
+BuildRequires:  lua53
 BuildRequires:  pkgconfig
-BuildRequires:  scons
+BuildRequires:  python2-base
+BuildRequires:  python2-xml
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
@@ -104,11 +106,10 @@
 and performant C++ library for implementing XMPP applications.
 
 %prep
-%setup -q -n swift-4.0rc2
+%setup -q -n swift-4.0rc3
 # Remove 3rd party libraries
 # Following ones are used from distro:
 find 3rdParty/Boost/src -delete
-find 3rdParty/SCons -delete
 find 3rdParty/Expat/src -delete
 find 3rdParty/LibIDN -delete
 find 3rdParty/Lua -delete
@@ -134,10 +135,10 @@
 sed -e 's:, myenv.File("../../COPYING.thirdparty")::' -i Swift/QtUI/SConscript
 
 %build
-scons %{_flags} Swift Swiften %{?_smp_mflags} boost_bundled_enable=false
+./scons %{_flags} Swift Swiften %{?_smp_mflags} boost_bundled_enable=false
 
 %install
-scons %{_flags} \
+./scons %{_flags} \
 SWIFT_INSTALLDIR=%{buildroot}%{_prefix} \
 SWIFTEN_INSTALLDIR=%{buildroot}%{_prefix} \
 SWIFTEN_LIBDIR=%{buildroot}%{_libdir} \

++ swift-4.0rc2.tar.gz -> swift-4.0rc3.tar.gz ++
/work/SRC/openSUSE:Factory/swift-im/swift-4.0rc2.tar.gz 
/work/SRC/openSUSE:Factory/.swift-im.new/swift-4.0rc3.tar.gz differ: char 5, 
line 1

commit swift-im for openSUSE:Factory

2017-11-23 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2017-11-23 09:43:53

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Thu Nov 23 09:43:53 2017 rev:5 rq:544360 version:4.0~rc2

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2017-11-09 
13:56:39.401608896 +0100
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2017-11-23 
09:43:53.401661671 +0100
@@ -1,0 +2,7 @@
+Wed Nov 22 09:43:03 UTC 2017 - mvet...@suse.com
+
+- bsc#1062799:
+  * Replace big boost-devel with only required boost devel libs
+  * Use boost_bundled_enable=false switch
+
+---



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.GVmMB5/_old  2017-11-23 09:43:54.289629268 +0100
+++ /var/tmp/diff_new_pack.GVmMB5/_new  2017-11-23 09:43:54.289629268 +0100
@@ -22,7 +22,6 @@
 %else
 %define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 
cxxflags='%{optflags}'
 %endif
-
 Name:   swift-im
 Version:4.0~rc2
 Release:0
@@ -31,12 +30,22 @@
 Group:  Productivity/Networking/Talk/Clients
 Url:http://swift.im/
 Source0:
http://swift.im/downloads/releases/%{_name}-4.0rc2/%{_name}-4.0rc2.tar.gz
-BuildRequires:  boost-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
+BuildRequires:  libboost_atomic-devel
+BuildRequires:  libboost_date_time-devel
+BuildRequires:  libboost_filesystem-devel
+BuildRequires:  libboost_headers-devel
+BuildRequires:  libboost_program_options-devel
+BuildRequires:  libboost_regex-devel
+BuildRequires:  libboost_serialization-devel
+BuildRequires:  libboost_signals-devel
+BuildRequires:  libboost_system-devel
+BuildRequires:  libboost_thread-devel
 BuildRequires:  libminiupnpc-devel
+BuildRequires:  pkgconfig
 BuildRequires:  scons
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt5Core)
@@ -125,7 +134,7 @@
 sed -e 's:, myenv.File("../../COPYING.thirdparty")::' -i Swift/QtUI/SConscript
 
 %build
-scons %{_flags} Swift Swiften %{?_smp_mflags}
+scons %{_flags} Swift Swiften %{?_smp_mflags} boost_bundled_enable=false
 
 %install
 scons %{_flags} \
@@ -144,7 +153,6 @@
 %postun -n libSwiften4 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc COPYING
 %{_bindir}/%{_name}-im
 %{_bindir}/%{_name}-open-uri
@@ -160,11 +168,9 @@
 %{_datadir}/%{_name}/translations/swift_*.qm
 
 %files -n libSwiften4
-%defattr(-,root,root)
 %{_prefix}/lib/libSwiften.so.*
 
 %files -n swiften-devel
-%defattr(-,root,root)
 %{_bindir}/swiften-config
 %{_includedir}/Swiften
 %{_prefix}/lib/libSwiften.so

commit swift-im for openSUSE:Factory

2017-11-09 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2017-11-09 13:56:01

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Thu Nov  9 13:56:01 2017 rev:4 rq:536259 version:4.0~rc2

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2017-08-24 
18:30:14.744640168 +0200
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2017-11-09 
13:56:39.401608896 +0100
@@ -1,0 +2,11 @@
+Thu Oct 19 18:34:04 UTC 2017 - fi...@opensuse.org
+
+- Use gcc6 for Leap to fix compilation issue.
+
+---
+Tue Oct 17 21:39:59 UTC 2017 - fi...@opensuse.org
+
+- Spec cleanup.
+- Ship translations within the package.
+
+---



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.78Spf1/_old  2017-11-09 13:56:40.705561394 +0100
+++ /var/tmp/diff_new_pack.78Spf1/_new  2017-11-09 13:56:40.709561249 +0100
@@ -17,6 +17,12 @@
 
 
 %define _name swift
+%if 0%{?sle_version} == 120300 || 0%{?sle_version} == 120200
+%define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 cc=gcc-6 
cxx=g++-6 cxxflags='%{optflags}'
+%else
+%define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 
cxxflags='%{optflags}'
+%endif
+
 Name:   swift-im
 Version:4.0~rc2
 Release:0
@@ -24,35 +30,44 @@
 License:GPL-3.0
 Group:  Productivity/Networking/Talk/Clients
 Url:http://swift.im/
-#Source0:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz
-Source0:
http://swift.im/downloads/releases/swift-4.0rc2/swift-4.0rc2.tar.gz
-BuildRequires:  avahi-devel
+Source0:
http://swift.im/downloads/releases/%{_name}-4.0rc2/%{_name}-4.0rc2.tar.gz
 BuildRequires:  boost-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
+BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  libQt5Core-devel
-BuildRequires:  libQt5DBus-devel
-BuildRequires:  libQt5Gui-devel
-BuildRequires:  libQt5Network-devel
-BuildRequires:  libQt5WebKit5-devel
-BuildRequires:  libQt5WebKitWidgets-devel
-BuildRequires:  libQt5Widgets-devel
-BuildRequires:  libexpat-devel
-BuildRequires:  libidn-devel
 BuildRequires:  libminiupnpc-devel
-BuildRequires:  libopenssl-devel
-BuildRequires:  libqt5-linguist-devel
-BuildRequires:  libqt5-qtbase-devel
-BuildRequires:  libqt5-qtdeclarative-devel
-BuildRequires:  libqt5-qtmultimedia-devel
-BuildRequires:  libqt5-qtsvg-devel
-BuildRequires:  libqt5-qttools
-BuildRequires:  libqt5-qtx11extras-devel
-BuildRequires:  libxslt
-BuildRequires:  python-xml
 BuildRequires:  scons
-BuildRequires:  zlib-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Multimedia)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt5UiTools)
+BuildRequires:  pkgconfig(Qt5WebKit)
+BuildRequires:  pkgconfig(Qt5WebKitWidgets)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  pkgconfig(avahi-client)
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(hunspell)
+BuildRequires:  pkgconfig(libedit)
+BuildRequires:  pkgconfig(libidn)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(python)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(zlib)
+%if 0%{?sle_version} == 120300 || 0%{?sle_version} == 120200
+BuildRequires:  -gcc
+BuildRequires:  -gcc-c++
+BuildRequires:  gcc6
+BuildRequires:  gcc6-c++
+%endif
 
 %description
 Swift is an easy to setup and use Jabber/XMPP instant messaging chat
@@ -81,7 +96,6 @@
 
 %prep
 %setup -q -n swift-4.0rc2
-
 # Remove 3rd party libraries
 # Following ones are used from distro:
 find 3rdParty/Boost/src -delete
@@ -108,44 +122,22 @@
 # Needed for tests
 # find 3rdParty/HippoMocks -delete
 
-echo 'ccflags="%{optflags} -fPIC".split(" ")' >> config.py
+sed -e 's:, myenv.File("../../COPYING.thirdparty")::' -i Swift/QtUI/SConscript
 
 %build
-scons V=1 Swift Swiften swiften_dll=1 test=none %{?_smp_mflags}
+scons %{_flags} Swift Swiften %{?_smp_mflags}
 
-%install SWIFTEN_INSTALLDIR=%{buildroot}%{prefix}
+%install
+scons %{_flags} \
+SWIFT_INSTALLDIR=%{buildroot}%{_prefix} \
+SWIFTEN_INSTALLDIR=%{buildroot}%{_prefix} \
+SWIFTEN_LIBDIR=%{buildroot}%{_libdir} \
+%{buildroot}%{_prefix}

commit swift-im for openSUSE:Factory

2017-08-24 Thread root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2017-08-24 18:29:52

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Thu Aug 24 18:29:52 2017 rev:3 rq:502672 version:4.0~rc2

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2016-07-30 
00:27:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2017-08-24 
18:30:14.744640168 +0200
@@ -1,0 +2,21 @@
+Fri Jun  9 14:41:36 UTC 2017 - mvet...@suse.com
+
+- Update to version4.0 beta 2:
+  * Support for message carbons (XEP-0280)
+  * Trellis mode enabled as a default feature, allowing several tiled chats 
windows to be shown at once
+  * New chat theme including a new font
+  * Redesigned keyword highlighting
+  * Improved spell checker support on Linux
+  * Support for automatic software updates on macOS
+  * Support for unicode emojis on macOS
+  * And assorted smaller features and usability enhancements
+- Remove chmod for Swiften/Network/UnboundDomainNameResolver.
+  got upstreamed: https://github.com/swift/swift/pull/28
+- Remove patches:
+  * swift-libminiupnpc.patch: Upstreamed
+  * swift-missing-assert.patch: Upstreamed 
https://github.com/swift/swift/pull/32
+  * swift-system-font.patch: Rendering works now. Can use their
+  font for the roster
+- Add BuildRequires: libqt5-qtsvg-devel needs this to display properly
+
+---

Old:

  swift-4.0beta2.tar.gz
  swift-libminiupnpc.patch
  swift-missing-assert.patch
  swift-system-font.patch

New:

  swift-4.0rc2.tar.gz



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.7OLy0u/_old  2017-08-24 18:30:16.236429996 +0200
+++ /var/tmp/diff_new_pack.7OLy0u/_new  2017-08-24 18:30:16.248428306 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package swift-im
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -18,20 +18,14 @@
 
 %define _name swift
 Name:   swift-im
-Version:4.0~beta2
+Version:4.0~rc2
 Release:0
 Summary:XMPP client
 License:GPL-3.0
 Group:  Productivity/Networking/Talk/Clients
 Url:http://swift.im/
 #Source0:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz
-Source0:
http://swift.im/downloads/releases/swift-4.0beta2/swift-4.0beta2.tar.gz
-# FIX-OPENSUSE: Got added to upstream 
https://github.com/swift/swift/commit/f0e513b179d1b04c0e16537886b0dc5215537279
-Patch0: swift-libminiupnpc.patch
-# FIX-OPENSUSE: Use system font. Reverting 
https://github.com/swift/swift/commit/baf480995fc479573f549042b2a5f065ee0701ea.diff
-Patch1: swift-system-font.patch
-# FIX-UPSTREAM: Add missing include cassert. Sent upstream: 
https://github.com/swift/swift/pull/32
-Patch2: swift-missing-assert.patch
+Source0:
http://swift.im/downloads/releases/swift-4.0rc2/swift-4.0rc2.tar.gz
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  desktop-file-utils
@@ -52,6 +46,7 @@
 BuildRequires:  libqt5-qtbase-devel
 BuildRequires:  libqt5-qtdeclarative-devel
 BuildRequires:  libqt5-qtmultimedia-devel
+BuildRequires:  libqt5-qtsvg-devel
 BuildRequires:  libqt5-qttools
 BuildRequires:  libqt5-qtx11extras-devel
 BuildRequires:  libxslt
@@ -85,12 +80,7 @@
 and performant C++ library for implementing XMPP applications.
 
 %prep
-%setup -q -n swift-4.0beta2
-# TW uses version 2
-%patch0 -p1
-# We want to stay with system fonts not having custom ones
-%patch1 -p1 -R
-%patch2 -p1
+%setup -q -n swift-4.0rc2
 
 # Remove 3rd party libraries
 # Following ones are used from distro:
@@ -124,13 +114,10 @@
 scons V=1 Swift Swiften swiften_dll=1 test=none %{?_smp_mflags}
 
 %install SWIFTEN_INSTALLDIR=%{buildroot}%{prefix}
-# Drop exec rights. Sent upstream: https://github.com/swift/swift/pull/28
-chmod 644 Swiften/Network/UnboundDomainNameResolver.*
 
 scons V=1 swiften_dll=1 SWIFTEN_INSTALLDIR=%{buildroot}%{_prefix} 
SWIFTEN_LIBDIR=%{buildroot}/%{_libdir} %{buildroot}%{_prefix}
 install -p -D -m 755 Swift/QtUI/swift-im \
 %{buildroot}%{_bindir}/swift-im
-
 install -p -m 644 -D Swift/resources/logo/logo-icon-32.xpm \
 %{buildroot}%{_datadir}/pixmaps/%{_name}.xpm
 install -p -m 644 -D Swift/resources/logo/logo-icon-128.png \
@@ -151,8 +138,9 @@
 --dir=%{buildroot}%{_datadir}/applications \
 Swift/resources/swift.desktop
 
-%check

commit swift-im for openSUSE:Factory

2016-07-29 Thread h_root 
Hello community,

here is the log from the commit of package swift-im for openSUSE:Factory 
checked in at 2016-07-30 00:27:43

Comparing /work/SRC/openSUSE:Factory/swift-im (Old)
 and  /work/SRC/openSUSE:Factory/.swift-im.new (New)


Package is "swift-im"

Changes:

--- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes2016-05-25 
21:27:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes   2016-07-30 
00:27:46.0 +0200
@@ -1,0 +2,21 @@
+Wed Jul 27 11:53:12 UTC 2016 - mvet...@suse.com
+
+- Add swift-missing-assert.patch: Fix missing include cassert.
+  Needed to build successfully on Leap.
+
+---
+Tue Jul 26 11:12:25 UTC 2016 - mvet...@suse.com
+
+- Update to version 4 Beta 2:
+* Support for message carbons (XEP-0280)
+* Improved spell checker support on Linux
+   * Enabled trellis mode as a default feature, allowing several tiled 
chats windows to be shown at once
+   * New chat theme including a new font
+   * And assorted smaller features and usability enhancements
+* Fix Swift bug introduced in 4.0-beta1 that results in the UI sometimes 
getting stuck during login
+- Add:
+  * swift-libminiupnpc.patch: Tumbleweed uses libminiupnpc 2.0 this adds 
support for version 1 and 2
+  * swift-system-font.patch: swift brings its own Fonts, which don't look very 
good
+we stay with the system fonts (for roster, menu. Chatwindow uses Webview 
with different font)
+
+---

Old:

  swift-3.0.tar.gz

New:

  swift-4.0beta2.tar.gz
  swift-libminiupnpc.patch
  swift-missing-assert.patch
  swift-system-font.patch



Other differences:
--
++ swift-im.spec ++
--- /var/tmp/diff_new_pack.rbufhv/_old  2016-07-30 00:27:48.0 +0200
+++ /var/tmp/diff_new_pack.rbufhv/_new  2016-07-30 00:27:48.0 +0200
@@ -18,13 +18,20 @@
 
 %define _name swift
 Name:   swift-im
-Version:3.0
+Version:4.0~beta2
 Release:0
 Summary:XMPP client
 License:GPL-3.0
 Group:  Productivity/Networking/Talk/Clients
 Url:http://swift.im/
-Source0:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz
+#Source0:
http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz
+Source0:
http://swift.im/downloads/releases/swift-4.0beta2/swift-4.0beta2.tar.gz
+# FIX-OPENSUSE: Got added to upstream 
https://github.com/swift/swift/commit/f0e513b179d1b04c0e16537886b0dc5215537279
+Patch0: swift-libminiupnpc.patch
+# FIX-OPENSUSE: Use system font. Reverting 
https://github.com/swift/swift/commit/baf480995fc479573f549042b2a5f065ee0701ea.diff
+Patch1: swift-system-font.patch
+# FIX-UPSTREAM: Add missing include cassert. Sent upstream: 
https://github.com/swift/swift/pull/32
+Patch2: swift-missing-assert.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  desktop-file-utils
@@ -39,6 +46,7 @@
 BuildRequires:  libQt5Widgets-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libminiupnpc-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libqt5-linguist-devel
 BuildRequires:  libqt5-qtbase-devel
@@ -50,7 +58,6 @@
 BuildRequires:  python-xml
 BuildRequires:  scons
 BuildRequires:  zlib-devel
-BuildRequires:  libminiupnpc-devel
 
 %description
 Swift is an easy to setup and use Jabber/XMPP instant messaging chat
@@ -58,11 +65,11 @@
 
 #  swiften ---
 
-%package -n libSwiften3
+%package -n libSwiften4
 Summary:Cross-platform XMPP client/server library
 Group:  System/Libraries
 
-%description -n libSwiften3
+%description -n libSwiften4
 Swiften is a robust, high-quality, standards-compliant, cross-platform,
 and performant C++ library for implementing XMPP applications.
 
@@ -71,14 +78,19 @@
 %package -n swiften-devel
 Summary:Cross-platform XMPP client/server library (development files)
 Group:  Development/Libraries/C and C++
-Requires:   libSwiften3 = %{version}
+Requires:   libSwiften4 = %{version}
 
 %description -n swiften-devel
 Swiften is a robust, high-quality, standards-compliant, cross-platform,
 and performant C++ library for implementing XMPP applications.
 
 %prep
-%setup -q -n %{_name}-%{version}
+%setup -q -n swift-4.0beta2
+# TW uses version 2
+%patch0 -p1
+# We want to stay with system fonts not having custom ones
+%patch1 -p1 -R
+%patch2 -p1
 
 # Remove 3rd party libraries
 # Following ones are used from distro:
@@ -96,8 +108,6 @@
 # DNS (they use it on Android)
 find