update to 1.5.10

use composer-generators
check tarball signature
use SPDX license identifiers

1 files changed, 14 insertions, 33 deletions

diff --git a/roundcubemail.spec b/roundcubemail.spec
index aa2ac91..bcebe96 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -12,7 +12,7 @@
 
 # support for apache / nginx / php-fpm
 %global with_phpfpm 1
-%global upstream_version     1.5.9
+%global upstream_version     1.5.10
 #global upstream_prever      rc
 
 %global roundcubedir %{_datadir}/roundcubemail
@@ -33,9 +33,11 @@ Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 # https://github.com/pear/Crypt_GPG
 # http://jqueryui.com/
 # http://www.tinymce.com/
-License: GPLv3+ with exceptions and GPLv3+ and GPLv2 and LGPLv2+ and CC-BY-SA and MIT and BSD and PHP
+License: GPL-3.0-or-later AND GPL-2.0-only AND LGPL-2.0-or-later AND CC-BY-SA-3.0 AND MIT AND BSD-2-Clause AND BSD-3-Clause AND PHP-3.01
 URL: http://www.roundcube.net
 Source0: https://github.com/roundcube/roundcubemail/releases/download/%{upstream_version}%{?upstream_prever:-%{upstream_prever}}/roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}-complete.tar.gz
+Source8: https://github.com/roundcube/roundcubemail/releases/download/%{upstream_version}%{?upstream_prever:-%{upstream_prever}}/roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}-complete.tar.gz.asc
+Source9: https://roundcube.net/download/pubkey.asc
 
 Source1: roundcubemail.httpd
 Source3: roundcubemail.nginx
@@ -49,6 +51,8 @@ Patch1: roundcubemail-1.5-confpath.patch
 
 
 BuildArch: noarch
+BuildRequires: gnupg2
+BuildRequires: composer-generators
 # For test
 BuildRequires: php-cli
 
@@ -122,34 +126,6 @@ Provides: bundled(js-openpgp) = 4.10.9
 Provides: bundled(js-codemirror) = 5.58.3
 Provides: bundled(js-bootstrap) = 4.5.3
 Provides: bundled(js-lessjs) = 3.13.0
-# Bundled PHP libraries
-# see vendor/composer/installed.json
-Provides: bundled(php-endroid-qr-code) = 1.6.6
-Provides: bundled(php-guzzlehttp-guzzle) = 6.5.8
-Provides: bundled(php-guzzlehttp-promises) = 1.5.3
-Provides: bundled(php-guzzlehttp-psr7) = 1.9.1
-Provides: bundled(php-kolab-net-ldap3) = v1.1.5
-Provides: bundled(php-masterminds-html5) = 2.7.6
-Provides: bundled(php-paragonie-random-compat) = v2.0.21
-Provides: bundled(php-pear-auth-sasl) = v1.1.0
-Provides: bundled(php-pear-console-commandline) = v1.2.6
-Provides: bundled(php-pear-console-getopt) = v1.4.3
-Provides: bundled(php-pear-crypt-gpg) = v1.6.9
-Provides: bundled(php-pear-mail-mime) = 1.10.12
-Provides: bundled(php-pear-net-ldap2) = v2.3.0
-Provides: bundled(php-pear-net-sieve) = 1.4.6
-Provides: bundled(php-pear-net-smtp) = 1.10.1
-Provides: bundled(php-pear-net-socket) = v1.2.2
-Provides: bundled(php-pear-pear-core-minimal) = v1.10.15
-Provides: bundled(php-pear-pear-exception) = v1.0.2
-Provides: bundled(php-psr-http-message) = 1.0.1
-Provides: bundled(php-ralouphie-getallheaders) = 2.0.5
-Provides: bundled(php-roundcube-plugin-installer) = 0.3.3
-Provides: bundled(php-roundcube-rtf-html-php) = v2.2
-Provides: bundled(php-symfony-polyfill-intl-idn) = v1.19.0
-Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.19.0
-Provides: bundled(php-symfony-polyfill-php70) = v1.19.0
-Provides: bundled(php-symfony-polyfill-php72) = v1.19.0
 
 
 %description
@@ -164,12 +140,11 @@ CSS 2.
 
 
 %prep
+%{?gpgverify: %{gpgverify} --keyring=%{SOURCE9} --signature=%{SOURCE8} --data=%{SOURCE0}}
+
 %setup -q -n roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}
 %patch -P1 -p1 -b .rpm
 
-: PHP bundled libraries
-php %{SOURCE5} vendor/composer/installed.json
-
 %if %{with internet}
 : JS bundled libraries
 php %{SOURCE5} https://raw.githubusercontent.com/roundcube/roundcubemail/%{version}/jsdeps.json
@@ -299,6 +274,12 @@ fi
 
 
 %changelog
+* Mon Jun  2 2025 Remi Collet <remi@remirepo.net> - 1.5.10-1
+- update to 1.5.10
+- use composer-generators
+- check tarball signature
+- use SPDX license identifiers
+
 * Mon Sep  2 2024 Remi Collet <remi@remirepo.net> - 1.5.9-1
 - update to 1.5.9