Accepting request 626681 from KDE:Extra

- Do not ship quassel.SuSEfirewall2 as firewalld has the config
  within its general package

- Version update to 0.13-rc1:
  * New branding, more modern icons (from the Breeze icon theme)
  * Better support for icon themes
  * Many UI improvements
  * Support for many IRCv3 features, including the display of modern formatting codes
  * Functionality such as highlights and chat activity tracking move into the core to help mobile clients to be more efficient
  * Support for containerization, i.e. config-less core
  * Optional authentication via LDAP
  * Database improvements, including support for 64 bit IDs and timestamps, and performance tweaks
  * For more see ChangeLog
- Drop merged patch Fix-build-with-Qt5.11.patch

OBS-URL: https://build.opensuse.org/request/show/626681
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quassel?expand=0&rev=45

Fix-build-with-Qt5.11.patch

@@ -1,69 +0,0 @@
-From 92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62 Mon Sep 17 00:00:00 2001
-From: Manuel Nickschas <sputnick@quassel-irc.org>
-Date: Thu, 3 May 2018 23:19:34 +0200
-Subject: [PATCH] cmake: Fix build with Qt 5.11
-
-Qt 5.11 removes the qt5_use_modules function, so add a copy. If
-present, the Qt-provided function will be used instead.
-
-Closes GH-355.
----
- cmake/QuasselMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 38 insertions(+)
-
-diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
-index 652c0042d..d77ba1cfb 100644
---- a/cmake/QuasselMacros.cmake
-+++ b/cmake/QuasselMacros.cmake
-@@ -5,6 +5,9 @@
- # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
- # (C) 2005-2009 Kitware, Inc.
- #
-+# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
-+# (C) 2005-2011 Kitware, Inc.
-+#
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
-@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
-     endforeach()
- endfunction()
- 
-+# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version.
-+# If present, the Qt-provided version will be used automatically instead.
-+function(qt5_use_modules _target _link_type)
-+    if (NOT TARGET ${_target})
-+        message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
-+    endif()
-+    if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
-+        set(_qt5_modules ${ARGN})
-+        set(_qt5_link_type ${_link_type})
-+    else()
-+        set(_qt5_modules ${_link_type} ${ARGN})
-+    endif()
-+
-+    if ("${_qt5_modules}" STREQUAL "")
-+        message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
-+    endif()
-+    foreach(_module ${_qt5_modules})
-+        if (NOT Qt5${_module}_FOUND)
-+            find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
-+            if (NOT Qt5${_module}_FOUND)
-+                message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
-+            endif()
-+        endif()
-+        target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
-+        set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
-+        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
-+        if (Qt5_POSITION_INDEPENDENT_CODE
-+                AND (CMAKE_VERSION VERSION_LESS 2.8.12
-+                    AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-+                    OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
-+            set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
-+        endif()
-+    endforeach()
-+endfunction()
-+
- # Some wrappers for simplifying dual-Qt support
- 
- function(qt_use_modules)

quassel-0.12.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1894574dfd79654152a5b7427e7df592b055ae908230504f98a4cb48961e74e2
-size 3747392

quassel-0.13-rc1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:188ee95911a4071d64c88bef4d67b336a497110ada16b957b840c2e2b2836507
+size 4114806

quassel-rpmlintrc

@@ -1,6 +1,5 @@
 addFilter("incoherent-init-script-name quasselcore")
 addFilter("incoherent-logrotate-file /etc/logrotate.d/quasselcore")
-addFilter("non-conffile-in-etc /etc/sysconfig/SuSEfirewall2.d/services/quassel")
 addFilter("explicit-lib-dependency libqt5_sql_backend")
 addFilter("non-standard-uid /var/log/quassel quasslecore")
 addFilter("non-standard-uid /var/lib/quasselcore quasslecore")

quassel.SuSEfirewall2

@@ -1,6 +0,0 @@
-## Name: Quassel Core
-## Description: opens port for quassel core  in order to allow clients to connect to it
-
-# space separated list of allowed TCP ports
-TCP="4242"
-

quassel.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:55:31 UTC 2018 - tchvatal@suse.com
+
+- Do not ship quassel.SuSEfirewall2 as firewalld has the config
+  within its general package
+
+-------------------------------------------------------------------
+Tue Jul 31 11:27:33 UTC 2018 - tchvatal@suse.com
+
+- Version update to 0.13-rc1:
+  * New branding, more modern icons (from the Breeze icon theme)
+  * Better support for icon themes
+  * Many UI improvements
+  * Support for many IRCv3 features, including the display of modern formatting codes
+  * Functionality such as highlights and chat activity tracking move into the core to help mobile clients to be more efficient
+  * Support for containerization, i.e. config-less core
+  * Optional authentication via LDAP
+  * Database improvements, including support for 64 bit IDs and timestamps, and performance tweaks
+  * For more see ChangeLog
+- Drop merged patch Fix-build-with-Qt5.11.patch
+
 -------------------------------------------------------------------
 Wed Jul 11 10:25:08 UTC 2018 - rkitover@gmail.com
 

quassel.spec

@@ -20,23 +20,21 @@
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
+%define realver 0.13-rc1
 Name:           quassel
-Version:        0.12.5
+Version:        0.13~rc1
 Release:        0
 Summary:        Distributed IRC client
 License:        GPL-2.0-only OR GPL-3.0-only
 Group:          Productivity/Networking/IRC
 URL:            http://quassel-irc.org/
-Source:         http://%{name}-irc.org/pub/%{name}-%{version}.tar.bz2
+Source:         http://%{name}-irc.org/pub/%{name}-%{realver}.tar.bz2
 Source1:        service.%{name}core
 Source2:        sysconfig.%{name}core
 Source3:        logrotate.%{name}core
-Source4:        %{name}.SuSEfirewall2
 Source5:        quassel-rpmlintrc
 # PATCH-FIX-SUSE: Set the correct libraries and compiler flags in order to use qglobal.h in check_cxx_source_compiles function
 Patch0:         quassel-set-required-libs-and-flags.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         Fix-build-with-Qt5.11.patch
 BuildRequires:  cmake >= 2.8.10
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
@@ -54,13 +52,13 @@ BuildRequires:  snorenotify-qt5-devel >= 0.7
 BuildRequires:  cmake(Qt5LinguistTools)
 BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Script)
 BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(Qt5WebEngine)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(dbusmenu-qt5)
-BuildRequires:  pkgconfig(phonon4qt5)
 BuildRequires:  pkgconfig(qca2-qt5)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(zlib)
@@ -149,9 +147,8 @@ such as WeeChat, but graphical.
 This contains common parts shared by %{name} and %{name}-client.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{realver}
 %patch0 -p1
-%patch1 -p1
 
 %build
 FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -186,7 +183,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcquasselcore
 install -D -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.quasselcore
 install -d -m 751 %{buildroot}%{_localstatedir}/log/%{name}
 install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}core
-install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 
 # rewrite env shebang on scripts to normal shebang
 sed -i '1{
@@ -257,7 +253,6 @@ fi
 %{_sbindir}/rc%{name}core
 %{_unitdir}/%{name}core.service
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}core
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %attr(-,%{name}core,%{name}core) %dir %{_localstatedir}/lib/%{name}core
 %attr(-,%{name}core,%{name}core) %dir %{_localstatedir}/log/%{name}
 %{_fillupdir}/sysconfig.%{name}core
@@ -269,13 +264,6 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/icons/hicolor/*/status/%{name}-*.png
-%{_datadir}/icons/hicolor/*/status/irc-channel-joined.png
-%{_datadir}/icons/hicolor/*/status/irc-channel-parted.png
-%{_datadir}/icons/hicolor/*/actions/im-user-away.png
-%{_datadir}/icons/hicolor/*/actions/im-user-offline.png
-%{_datadir}/icons/hicolor/*/actions/im-user.png
-%{_datadir}/icons/hicolor/scalable/*/*
 %{_datadir}/knotifications5/%{name}.notifyrc
 
 %changelog