summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-09-23 07:19:47 +0200
committerRemi Collet <remi@php.net>2023-09-23 07:19:47 +0200
commitef97b7e31dd47b38f74d7a1c596845c9f151d4cf (patch)
treed018472076b22f623607e8ffe9af9c2b5ccee868
parenteade1d9718e12bea9925deee934e25c247270813 (diff)
update to 1.4.14
-rw-r--r--composer.json7
-rw-r--r--roundcubemail.spec8
2 files changed, 12 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index d032a5e..20cf364 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
}
],
"require": {
- "php": ">=5.4.0",
+ "php": ">=5.4.0 <8",
"pear/pear-core-minimal": "~1.10.1",
"pear/auth_sasl": "~1.1.0",
"pear/net_idna2": "~0.2.0",
@@ -27,5 +27,10 @@
},
"suggest": {
"mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver"
+ },
+ "config": {
+ "allow-plugins": {
+ "roundcube/plugin-installer": true
+ }
}
}
diff --git a/roundcubemail.spec b/roundcubemail.spec
index d081dc6..f9341dd 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -17,7 +17,7 @@
%else
%global with_phpfpm 0
%endif
-%global upstream_version 1.4.13
+%global upstream_version 1.4.14
#global upstream_prever rc2
%global roundcubedir %{_datadir}/roundcubemail
@@ -76,6 +76,7 @@ BuildRequires: php-composer(masterminds/html5) < 3
BuildRequires: php-composer(masterminds/html5) >= 2.5.0
%endif
+Requires: php(language) < 8
%if %{with_phpfpm}
Requires: webserver
Requires: nginx-filesystem
@@ -196,7 +197,7 @@ CSS 2.
%prep
%setup -q -n roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}
-%patch1 -p1 -b .rpm
+%patch -P1 -p1 -b .rpm
# fix permissions and remove any .htaccess files
find . -type f -print | xargs chmod a-x
@@ -344,6 +345,9 @@ fi
%changelog
+* Sat Sep 23 2023 Remi Collet <remi@remirepo.net> - 1.4.14-1
+- update to 1.4.14
+
* Fri Dec 31 2021 Remi Collet <remi@remirepo.net> - 1.4.13-1
- update to 1.4.13