summaryrefslogtreecommitdiffstats
path: root/roundcubemail.spec
diff options
context:
space:
mode:
Diffstat (limited to 'roundcubemail.spec')
-rw-r--r--roundcubemail.spec41
1 files changed, 25 insertions, 16 deletions
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 4a2d453..5adcddc 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -18,8 +18,8 @@
%else
%global with_phpfpm 0
%endif
-%global upstream_version 1.5.2
-#global upstream_prever rc
+%global upstream_version 1.6
+%global upstream_prever beta
%global roundcubedir %{_datadir}/roundcubemail
%global _logdir /var/log
@@ -51,10 +51,13 @@ Source4: roundcubemail-README-rpm.txt
Source5: roundcubemail-bundled.php
# Non-upstreamable: Adjusts config path to Fedora policy
-Patch1: roundcubemail-1.5-confpath.patch
+Patch1: roundcubemail-1.6-confpath.patch
+# See https://github.com/roundcube/roundcubemail/pull/846
+Patch2: roundcubemail-1.6-legacy.patch
BuildArch: noarch
+BuildRequires: php(language) >= 7.3
# For test
BuildRequires: php-cli
@@ -67,6 +70,7 @@ Requires: php(httpd)
Requires: httpd
Requires: mod_php
%endif
+Requires: php(language) >= 7.3
Requires: php-ctype
Requires: php-curl
Requires: php-date
@@ -128,23 +132,22 @@ Provides: bundled(js-jstimezonedetect) = 1.0.7
Provides: bundled(js-publickey) = 0e011cb1
Provides: bundled(js-tinymce) = 5.8.2
Provides: bundled(js-tinymce-langs) = 5.8.2
-Provides: bundled(js-openpgp) = 4.10.9
+Provides: bundled(js-openpgp) = 5.0.0
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.5
+Provides: bundled(php-dasprid-enum) = 1.0.3
+Provides: bundled(php-guzzlehttp-guzzle) = 7.4.1
Provides: bundled(php-guzzlehttp-promises) = 1.5.1
-Provides: bundled(php-guzzlehttp-psr7) = 1.8.3
+Provides: bundled(php-guzzlehttp-psr7) = 2.1.0
Provides: bundled(php-kolab-net-ldap3) = v1.1.3
Provides: bundled(php-masterminds-html5) = 2.7.5
-Provides: bundled(php-paragonie-random-compat) = v2.0.20
Provides: bundled(php-pear-auth-sasl) = v1.1.0
Provides: bundled(php-pear-console-commandline) = v1.2.4
Provides: bundled(php-pear-console-getopt) = v1.4.3
-Provides: bundled(php-pear-crypt-gpg) = v1.6.6
+Provides: bundled(php-pear-crypt-gpg) = v1.6.7
Provides: bundled(php-pear-mail-mime) = 1.10.11
Provides: bundled(php-pear-net-ldap2) = v2.2.0
Provides: bundled(php-pear-net-sieve) = 1.4.5
@@ -152,14 +155,13 @@ Provides: bundled(php-pear-net-smtp) = 1.10.0
Provides: bundled(php-pear-net-socket) = v1.2.2
Provides: bundled(php-pear-pear-core-minimal) = v1.10.11
Provides: bundled(php-pear-pear-exception) = v1.0.2
+Provides: bundled(php-psr-http-client) = 1.0.1
+Provides: bundled(php-psr-http-factory) = 1.0.1
Provides: bundled(php-psr-http-message) = 1.0.1
-Provides: bundled(php-ralouphie-getallheaders) = 2.0.5
+Provides: bundled(php-ralouphie-getallheaders) = 3.0.3
Provides: bundled(php-roundcube-plugin-installer) = 0.3.1
Provides: bundled(php-roundcube-rtf-html-php) = v2.1
-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
+Provides: bundled(php-symfony-deprecation-contracts) = v2.2.0
%description
@@ -176,13 +178,14 @@ CSS 2.
%prep
%setup -q -n roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}
%patch1 -p1 -b .rpm
+%patch2 -p1
: 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
+php %{SOURCE5} https://raw.githubusercontent.com/roundcube/roundcubemail/%{upstream_version}%{?upstream_prever:-%{upstream_prever}}/jsdeps.json
%endif
# fix permissions and remove any .htaccess files
@@ -258,7 +261,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", "RtfHtmlPhp\\Document" ];
+ "Net_LDAP3", "Net_Sieve", "Net_SMTP", "PEAR" , "BaconQrCode\\Writer", "RtfHtmlPhp\\Document" ];
$ret = 0;
foreach ($cl as $c) {
if (class_exists($c)) {
@@ -311,6 +314,12 @@ fi
%changelog
+* Mon Mar 7 2022 Remi Collet <remi@remirepo.net> - 1.6~beta-1
+- update to 1.6-beta
+- raise dependency on PHP 7.3
+- add patch to keep use default_host and smtp_server
+ from https://github.com/roundcube/roundcubemail/pull/8467
+
* Thu Dec 30 2021 Remi Collet <remi@remirepo.net> - 1.5.2-1
- update to 1.5.2