diff options
| -rw-r--r-- | roundcubemail-pr5820.patch | 22 | ||||
| -rw-r--r-- | roundcubemail.spec | 12 |
2 files changed, 5 insertions, 29 deletions
diff --git a/roundcubemail-pr5820.patch b/roundcubemail-pr5820.patch deleted file mode 100644 index 0f5cbc5..0000000 --- a/roundcubemail-pr5820.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 416eb9b80480b4e07b2868e37fb56fff966b77c7 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 27 Jun 2017 11:40:09 +0200 -Subject: [PATCH] drop ereg dependency, fix compat with PHP 7 - ---- - plugins/password/drivers/cpanel_webmail.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/password/drivers/cpanel_webmail.php b/plugins/password/drivers/cpanel_webmail.php -index a34b6a1f8..8aabd3c6c 100644 ---- a/plugins/password/drivers/cpanel_webmail.php -+++ b/plugins/password/drivers/cpanel_webmail.php -@@ -41,7 +41,7 @@ public function save($curpas, $newpass) - { - $user = $_SESSION['username']; - $userpwd = "$user:$curpas"; -- list($login) = split('@', $user); -+ list($login) = explode('@', $user); - - $data = array( - 'email' => $login, diff --git a/roundcubemail.spec b/roundcubemail.spec index f6fc8ce..eb7d6f0 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -20,8 +20,8 @@ %global roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log Name: roundcubemail -Version: 1.3.0 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client Group: Applications/System @@ -52,10 +52,6 @@ Patch1: roundcubemail-1.2.1-confpath.patch # see https://github.com/roundcube/roundcubemail/pull/313 Patch2: roundcubemail-pr313.patch -# Fix PHP 7 compatibility -# see https://github.com/roundcube/roundcubemail/pull/5820 -Patch3: roundcubemail-pr5820.patch - BuildArch: noarch # For test BuildRequires: php-cli @@ -183,7 +179,6 @@ CSS 2. %setup -q -n roundcubemail-%{version}%{?prever:-%{prever}} %patch1 -p1 %patch2 -p1 -%patch3 -p1 # fix permissions and remove any .htaccess files find . -type f -print | xargs chmod a-x @@ -332,6 +327,9 @@ fi %changelog +* Tue Sep 5 2017 Remi Collet <remi@remirepo.net> - 1.3.1-1 +- Update to 1.3.1 + * Tue Jun 27 2017 Remi Collet <remi@remirepo.net> - 1.3.0-2 - fix autoloader (for kolab/Net_LDAP3) - add a minimal %%check for our autoloader |