update to 1.5.0

2 files changed, 27 insertions, 15 deletions

diff --git a/composer.json b/composer.json
index f6d3ae0..f9a28eb 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,8 @@
         "pear/net_smtp": "~1.10.0",
         "pear/crypt_gpg": "~1.6.3",
         "pear/net_sieve": "~1.4.5",
-        "roundcube/plugin-installer": "~0.2.0",
+        "roundcube/plugin-installer": "~0.3.0",
+        "roundcube/rtf-html-php": "~2.1",
         "masterminds/html5": "~2.7.0",
         "endroid/qr-code": "~1.6.5",
         "guzzlehttp/guzzle": "^6.5.5",
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 1ad9177..de1d014 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -17,14 +17,14 @@
 %else
 %global with_phpfpm 0
 %endif
-%global upstream_version     1.5
-%global upstream_prever      rc
+%global upstream_version     1.5.0
+#global upstream_prever      rc
 
 %global roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
 Version:  %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:  2%{?dist}
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 # Since 0.8 beta, the main code has been GPLv3+ with exceptions and
@@ -65,13 +65,16 @@ BuildRequires: php-composer(kolab/net_ldap3) >= 1.1.1
 BuildRequires: php-composer(fedora/autoloader)
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(endroid/qrcode)    >= 1.6.5 with php-composer(endroid/qrcode)    < 2)
-BuildRequires: (php-composer(masterminds/html5) >= 2.7.0 with php-composer(masterminds/html5) <  3)
-BuildRequires: (php-composer(guzzlehttp/guzzle) >= 6.5.5 with php-composer(guzzlehttp/guzzle) <  7)
-# remirepo:8
+BuildRequires: (php-composer(endroid/qrcode)         >= 1.6.5 with php-composer(endroid/qrcode)         < 2)
+BuildRequires: (php-composer(roundcube/rtf-html-php) >= 2.1   with php-composer(roundcube/rtf-html-php) < 3)
+BuildRequires: (php-composer(masterminds/html5)      >= 2.7.0 with php-composer(masterminds/html5)      < 3)
+BuildRequires: (php-composer(guzzlehttp/guzzle)      >= 6.5.5 with php-composer(guzzlehttp/guzzle)      < 7)
+# remirepo:10
 %else
 BuildRequires:  php-endroid-qrcode     <  2
 BuildRequires:  php-endroid-qrcode     >= 1.6.5
+BuildRequires:  php-roundcube-rtf-html-php <  3
+BuildRequires:  php-roundcube-rtf-html-php >= 2.1
 BuildRequires:  php-masterminds-html5  <  3
 BuildRequires:  php-masterminds-html5  >= 2.7.0
 BuildRequires:  php-guzzlehttp-guzzle6 <  7
@@ -116,7 +119,8 @@ Requires: php-xml
 #        "pear/net_smtp": "~1.10.0",
 #        "pear/crypt_gpg": "~1.6.0",
 #        "pear/net_sieve": "~1.4.5",
-#        "roundcube/plugin-installer": "~0.1.6",
+#        "roundcube/plugin-installer": "~0.3.0",
+#        "roundcube/rtf-html-php": "~2.1",
 #        "masterminds/html5": "~2.7.0",
 #        "endroid/qrcode": "~1.6.5"
 #        "guzzlehttp/guzzle": "^6.5.5",
@@ -132,16 +136,19 @@ Requires: php-pear(Net_LDAP2)       >= 2.2.0
 Requires: php-composer(kolab/net_ldap3) >= 1.1.1
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(endroid/qrcode)    >= 1.6.5 with php-composer(endroid/qrcode)    <  2)
-Requires: (php-composer(masterminds/html5) >= 2.7.0 with php-composer(masterminds/html5) <  3)
-Requires: (php-composer(guzzlehttp/guzzle) >= 6.5.5 with php-composer(guzzlehttp/guzzle) <  7)
+Requires: (php-composer(endroid/qrcode)         >= 1.6.5 with php-composer(endroid/qrcode)         < 2)
+Requires: (php-composer(roundcube/rtf-html-php) >= 2.1   with php-composer(roundcube/rtf-html-php) < 3)
+Requires: (php-composer(masterminds/html5)      >= 2.7.0 with php-composer(masterminds/html5)      < 3)
+Requires: (php-composer(guzzlehttp/guzzle)      >= 6.5.5 with php-composer(guzzlehttp/guzzle)      < 7)
 # From composer.json-dist, "suggest": {
 #        "bjeavons/zxcvbn-php": "^1.0 required for Zxcvbn password strength driver"
-Suggests: (php-composer(bjeavons/zxcvbn-php) >= 1.0 with php-composer(bjeavons/zxcvbn-php) <  5)
-# remirepo:8
+Suggests: (php-composer(bjeavons/zxcvbn-php)    >= 1.0 with php-composer(bjeavons/zxcvbn-php)      < 5)
+# remirepo:10
 %else
 Requires:  php-endroid-qrcode     <  2
 Requires:  php-endroid-qrcode     >= 1.6.5
+Requires:  php-roundcube-rtf-html-php <  3
+Requires:  php-roundcube-rtf-html-php >= 2.1
 Requires:  php-masterminds-html5  <  3
 Requires:  php-masterminds-html5  >= 2.7.0
 Requires:  php-guzzlehttp-guzzle6 <  7
@@ -228,6 +235,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
     '%{_datadir}/php/Endroid/QrCode/autoload.php',
     '%{_datadir}/php/GuzzleHttp6/autoload.php',
+    '%{_datadir}/php/Roundcube/RtfHtmlPhp/autoload.php',
     '%{_datadir}/php/Masterminds/HTML5/autoload.php',
 ]);
 \Fedora\Autoloader\Dependencies::optional([
@@ -296,7 +304,7 @@ rm    %{buildroot}%{roundcubedir}/composer.json-dist
 php -r '
 require "%{buildroot}%{roundcubedir}/vendor/autoload.php";
 $cl = [ "Auth_SASL", "Crypt_GPG", "Mail_mime", "Net_LDAP2", "Masterminds\\HTML5", "GuzzleHttp\\Client",
-        "Net_LDAP3", "Net_Sieve", "Net_SMTP", "PEAR" , "Endroid\\QrCode\\QrCode" ];
+        "Net_LDAP3", "Net_Sieve", "Net_SMTP", "PEAR" , "Endroid\\QrCode\\QrCode", "RtfHtmlPhp\\Document" ];
 $ret = 0;
 foreach ($cl as $c) {
   if (class_exists($c)) {
@@ -349,6 +357,9 @@ fi
 
 
 %changelog
+* Tue Oct 19 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+
 * Mon Jul  5 2021 Remi Collet <remi@remirepo.net> - 1.5~rc-2
 - update to 1.5-rc
 - raise dependency on pear/net_smtp 1.10