From 9f01eb9ab33116c7a3f91205511329c0a09d9336 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Dec 13 2022 15:35:51 +0000
Subject: Converted license tag to SPDX format.


---

diff --git a/.gitignore b/.gitignore
index 4a61cc4..9b3c692 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,3 @@
-emoticons-0.10.tar.gz
-psi-lang-packs-0.13-1.tar.gz
-rostericons-0.10.tar.gz
-psi-0.14.tar.bz2
-/psi-0.15-beta2.tar.bz2
-/psi-0.15-rc1.tar.bz2
-/psi-0.15-rc2.tar.bz2
-/psi-0.15-rc3.tar.bz2
-/psi-0.15.tar.bz2
-/psi-qjdns.patch
-/psi-1.3.tar.xz
-/psi-l10n-1.3.tar.gz
-/psi-plugins-1.3.tar.gz
-/psi-1.4.tar.xz
-/psi-l10n-1.4.tar.gz
-/psi-plugins-1.4.tar.gz
-/psi-1.5.tar.xz
-/psi-l10n-1.5.tar.gz
-/psi-plugins-1.5.tar.gz
+/psi-*.tar.xz
+/psi-l10n-*.tar.gz
+/psi-plugins-*.tar.gz
diff --git a/psi.spec b/psi.spec
index a3290dc..7407adf 100644
--- a/psi.spec
+++ b/psi.spec
@@ -2,10 +2,10 @@ Name:           psi
 Version:        1.5
 Release:        9%{?dist}
 
-# GPLv2+ - core project.
-# LGPLv2.1+ - iris library, widgets, several tools.
-# zlib/libpng - bundled minizip library.
-License:        GPLv2+ and LGPLv2+ and zlib
+# GPL-2.0-or-later - core project.
+# LGPL-2.1-or-later - iris library, widgets, several tools.
+# Zlib - bundled minizip library.
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND Zlib
 Summary:        Jabber client based on Qt
 URL:            https://psi-im.org