$ git diff --patch-with-stat --summary 05b0c197ad3ed2e87c114af6cc87da2434ecb67d..1ba1f0cdce2df2440fd43f41b16520c4e053e5c1
.abf.yml | 2 +-
neochat.spec | 33 ++++++++++++++++++++++++---------
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index a8e508a..a9ca8ac 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- neochat-1.2.tar.gz: a8435bb02c760419b440d094981e3f236b31c247
+ neochat-22.09.tar.xz: 0fb7b8bcc11328db4dfda28034cb47c06fb7654f
diff --git a/neochat.spec b/neochat.spec
index d16825b..17d7ef6 100644
--- a/neochat.spec
+++ b/neochat.spec
@@ -1,15 +1,21 @@
-#define git 20210615
-%define gitcommit bc977c3fc6f9784cce5906a988427c47cca19c0d
+# Try avoid git in future, switch to upcoming stable release.
+# Before update to next git or whatever please at least check if current version/git works and not crashing on desktop archs (x86_64 or znver1)
+#define git 20211107
+#define gitcommit 71d01593b141f12bcf6556f8fb3e4e41d8a2c1d3
Name: neochat
-Version: 1.2
-Release: %{?git:0.%{git}.}1
+Version: 22.09
+Release: %{?git:1.%{git}.}1
License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and BSD
Summary: Client for matrix, the decentralized communication protocol
URL: https://invent.kde.org/network/neochat
-# git archive --format=tar.gz -o ../neochat-$(date +%Y%m%d).tar.gz --prefix=neochat-master-7e778d225baeefaf937ce8f022f86e10eb46e708/ master
+%if 0%{?git:1}
Source0: https://invent.kde.org/network/neochat/-/archive/%{?git:master}%{!?git:v%{version}}/%{name}-%{?git:%{git}}%{!?git:%{version}}.tar.gz
+%else
+Source0: https://download.kde.org/stable/plasma-mobile/%{version}/%{name}-%{version}.tar.xz
+%endif
+BuildRequires: cmake(QCoro5)
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
@@ -23,9 +29,14 @@ BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5ItemModels)
BuildRequires: cmake(KF5Kirigami2)
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5DBusAddons)
+BuildRequires: cmake(KF5ConfigWidgets)
+BuildRequires: cmake(KF5KIO)
+BuildRequires: cmake(KF5WindowSystem)
+BuildRequires: cmake(KF5Sonnet)
BuildRequires: cmake(Olm)
BuildRequires: cmake(QtOlm)
BuildRequires: cmake(Quotient)
@@ -35,11 +46,13 @@ BuildRequires: pkgconfig(libcmark)
BuildRequires: cmake(ECM)
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig(appstream-glib)
+BuildRequires: qml(org.kde.syntaxhighlighting)
Requires: hicolor-icon-theme
Requires: kirigami2
Requires: %{_lib}KF5ItemModels5
Requires: qml(org.kde.kquickimageeditor)
Requires: qt5-qtquickcontrols2
+Requires: qml(org.kde.syntaxhighlighting)
%description
Neochat is a client for Matrix, the decentralized communication protocol for
@@ -47,16 +60,17 @@ instant messaging. It is a fork of Spectral, using KDE frameworks, most
notably Kirigami, KConfig and KI18n.
%prep
-%autosetup -n %{name}-%{?git:master}%{!?git:v%{version}}-%{gitcommit} -p1
+%autosetup -p1
+%cmake_kde5
%build
-%cmake_kde5
-%ninja_build
+%ninja_build -C build
%install
%ninja_install -C build
+%find_lang %{name}
-%files
+%files -f %{name}.lang
%license LICENSES/*
%doc README.md
%{_bindir}/%{name}
@@ -64,3 +78,4 @@ notably Kirigami, KConfig and KI18n.
%{_datadir}/icons/hicolor/*/apps/*
%{_metainfodir}/*.appdata.xml
%{_datadir}/knotifications5/%{name}.notifyrc
+%{_datadir}/krunner/dbusplugins/plasma-runner-neochat.desktop