Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package konversation for openSUSE:Factory checked in at 2021-04-24 23:07:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konversation (Old) and /work/SRC/openSUSE:Factory/.konversation.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konversation" Sat Apr 24 23:07:50 2021 rev:64 rq:887711 version:21.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/konversation/konversation.changes 2021-03-08 15:13:53.441784781 +0100 +++ /work/SRC/openSUSE:Factory/.konversation.new.12324/konversation.changes 2021-04-24 23:08:41.883356197 +0200 @@ -1,0 +2,28 @@ +Fri Apr 16 16:12:28 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.04 +- No code change since 21.03.90 +- Use qdbus-qt5 in konversation scripts +- Stop owning directories provided by the filesystem package (boo#1184786) +- Add patch to allow using the konversation scripts on openSUSE + * 0001-Use-qdbus-qt5-on-openSUSE.patch (boo#1184826) + +------------------------------------------------------------------- +Fri Apr 9 17:40:54 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.03.90 + * New feature release +- No code change since 21.03.80 + +------------------------------------------------------------------- +Sun Mar 21 13:28:43 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.03.80 + * New feature release +- Too many changes since 20.12.3, only listing bugfixes: + * Consider # a valid channel name (kde#404072) + +------------------------------------------------------------------- Old: ---- konversation-20.12.3.tar.xz konversation-20.12.3.tar.xz.sig New: ---- 0001-Use-qdbus-qt5-on-openSUSE.patch konversation-21.04.0.tar.xz konversation-21.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konversation.spec ++++++ --- /var/tmp/diff_new_pack.Crzxzu/_old 2021-04-24 23:08:42.359356869 +0200 +++ /var/tmp/diff_new_pack.Crzxzu/_new 2021-04-24 23:08:42.359356869 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: konversation -Version: 20.12.3 +Version: 21.04.0 Release: 0 Summary: A graphical IRC client by KDE License: GPL-2.0-or-later @@ -32,6 +32,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-OPENSUSE +Patch0: 0001-Use-qdbus-qt5-on-openSUSE.patch BuildRequires: extra-cmake-modules BuildRequires: libqca-qt5-devel BuildRequires: cmake(KF5Archive) >= %{kf5_version} @@ -58,7 +60,7 @@ BuildRequires: cmake(KF5WidgetsAddons) >= %{kf5_version} BuildRequires: cmake(KF5WindowSystem) >= %{kf5_version} BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qt5Core) >= 5.12.0 +BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Widgets) Recommends: %{name}-lang = %{version} @@ -83,7 +85,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build @@ -100,7 +102,6 @@ %license LICENSES/* %doc AUTHORS ChangeLog NEWS README %doc %{_kf5_htmldir}/en/konversation/ -%dir %{_kf5_appstreamdir} %dir %{_kf5_sharedir}/kconf_update/ %{_kf5_applicationsdir}/org.kde.konversation.desktop %{_kf5_appstreamdir}/org.kde.konversation.appdata.xml ++++++ 0001-Use-qdbus-qt5-on-openSUSE.patch ++++++ >From 98d533470dbcedcd864115f30ac1cd0eaedd4f46 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Sat, 17 Apr 2021 22:46:13 +0200 Subject: [PATCH] Use qdbus-qt5 on openSUSE --- data/scripting_support/python/konversation/dbus.py | 2 +- data/scripts/fortune | 2 +- data/scripts/media | 2 +- data/scripts/sayclip | 2 +- data/scripts/uptime | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/scripting_support/python/konversation/dbus.py b/data/scripting_support/python/konversation/dbus.py index 163cfc63..c0940453 100644 --- a/data/scripting_support/python/konversation/dbus.py +++ b/data/scripting_support/python/konversation/dbus.py @@ -83,4 +83,4 @@ except IndexError: default_message_prefix = '' -_dbus_command = ('qdbus', 'org.kde.konversation', '/irc') +_dbus_command = ('qdbus-qt5', 'org.kde.konversation', '/irc') diff --git a/data/scripts/fortune b/data/scripts/fortune index 71379cc0..e68b2a08 100755 --- a/data/scripts/fortune +++ b/data/scripts/fortune @@ -51,4 +51,4 @@ while (<FORTUNES>) { } } close(FORTUNES); -exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, $MESSAGE; +exec 'qdbus-qt5', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, $MESSAGE; diff --git a/data/scripts/media b/data/scripts/media index a0a7dbaf..708a11dd 100755 --- a/data/scripts/media +++ b/data/scripts/media @@ -62,7 +62,7 @@ preferred_media = { # 'qdbus' command installed by Qt. If you need to you can change this here, # but beware that the output format of the alternate command has to match that # of 'qdbus'. -dbus_command = 'qdbus' +dbus_command = 'qdbus-qt5' # If one of the title, album or artist metadata fields contains a character # listed in FIXUP_CHARS, or if a string matching the regular expression given diff --git a/data/scripts/sayclip b/data/scripts/sayclip index 37cb550b..1ab29565 100755 --- a/data/scripts/sayclip +++ b/data/scripts/sayclip @@ -21,7 +21,7 @@ except ImportError: sys.exit("This script is intended to be run from within Konversation.") try: - clipboard = subprocess.check_output(('qdbus', 'org.kde.klipper', '/klipper', 'getClipboardContents')) + clipboard = subprocess.check_output(('qdbus-qt5', 'org.kde.klipper', '/klipper', 'getClipboardContents')) except subprocess.CalledProcessError: konversation.dbus.error(i18n("Unable to retrieve clipboard contents from Klipper."), exit=True) diff --git a/data/scripts/uptime b/data/scripts/uptime index 764239de..5ff30ac9 100755 --- a/data/scripts/uptime +++ b/data/scripts/uptime @@ -19,7 +19,7 @@ if($PLATFORM eq "FreeBSD") { } else { $UPTIME = `cat /proc/uptime`; if (not $UPTIME) { - exec 'qdbus', 'org.kde.konversation', '/irc', 'info', 'Could not read uptime. Check that /proc/uptime exists.'; + exec 'qdbus-qt5', 'org.kde.konversation', '/irc', 'info', 'Could not read uptime. Check that /proc/uptime exists.'; } @uparray = split(/\./, $UPTIME); $seconds = $uparray[0]; @@ -40,15 +40,15 @@ if($seconds > 60) $minutes = int($seconds/60); } if( $days && $hours ) { - exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, "Uptime: $days days, $hours hours and $minutes minutes"; + exec 'qdbus-qt5', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, "Uptime: $days days, $hours hours and $minutes minutes"; } elsif( !$days && $hours ) { - exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, "Uptime: $hours hours and $minutes minutes"; + exec 'qdbus-qt5', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, "Uptime: $hours hours and $minutes minutes"; } elsif( $days && !$hours ) { - exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, "Uptime: $days days and $minutes minutes"; + exec 'qdbus-qt5', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, "Uptime: $days days and $minutes minutes"; } elsif( !$days && !$hours ) { - exec 'qdbus', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, "Uptime: $minutes minutes"; + exec 'qdbus-qt5', 'org.kde.konversation', '/irc', 'say', $SERVER, $TARGET, "Uptime: $minutes minutes"; } -- 2.31.1 ++++++ konversation-20.12.3.tar.xz -> konversation-21.04.0.tar.xz ++++++ ++++ 175127 lines of diff (skipped)
