Update to 1.4-beta

raise dependency on pear/net_sieve 1.4.3
raise dependency on kolab/net_ldap3 1.0.6
add dependency on masterminds/html5

1 files changed, 48 insertions, 29 deletions

diff --git a/roundcubemail.spec b/roundcubemail.spec
index 52f4b57..c487ce6 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -15,12 +15,13 @@
 %else
 %global with_phpfpm 0
 %endif
-#global prever      rc
+%global upstream_version     1.4
+%global upstream_prever      beta
 
 %global roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  1.3.7
+Version:  %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -37,7 +38,7 @@ Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 # http://www.tinymce.com/
 License: GPLv3+ with exceptions and GPLv3+ and GPLv2 and LGPLv2+ and CC-BY-SA and (MIT or GPLv2)
 URL: http://www.roundcube.net
-Source0: https://github.com/roundcube/roundcubemail/releases/download/%{version}%{?prever:-%{prever}}/roundcubemail-%{version}%{?prever:-%{prever}}-complete.tar.gz
+Source0: https://github.com/roundcube/roundcubemail/releases/download/%{upstream_version}%{?upstream_prever:-%{upstream_prever}}/roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}-complete.tar.gz
 
 Source1: roundcubemail.httpd
 Source3: roundcubemail.nginx
@@ -45,11 +46,8 @@ Source2: roundcubemail.logrotate
 Source4: roundcubemail-README-rpm.txt
 
 # Non-upstreamable: Adjusts config path to Fedora policy
-Patch1: roundcubemail-1.3.4-confpath.patch
+Patch1: roundcubemail-1.4-confpath.patch
 
-# add .log prefix to all log file names
-# see https://github.com/roundcube/roundcubemail/pull/313
-Patch2: roundcubemail-pr313.patch
 
 BuildArch: noarch
 # For test
@@ -61,13 +59,19 @@ BuildRequires: php-pear(Net_IDNA2)       >= 0.2.0
 BuildRequires: php-pear(Mail_Mime)       >= 1.10.0
 BuildRequires: php-pear(Net_SMTP)        >= 1.7.1
 BuildRequires: php-pear(Crypt_GPG)       >= 1.6.0
-BuildRequires: php-pear(Net_Sieve)       >= 1.4.0
-BuildRequires: php-composer(endroid/qrcode) <  2
-BuildRequires: php-composer(endroid/qrcode) >= 1.6.5
+BuildRequires: php-pear(Net_Sieve)       >= 1.4.3
 BuildRequires: php-pear(Net_LDAP2)       >= 2.2.0
-BuildRequires: php-composer(kolab/Net_LDAP3)
+BuildRequires: php-composer(kolab/net_ldap3) >= 1.0.6
 BuildRequires: php-composer(fedora/autoloader)
-
+%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.3.0 with php-composer(masterminds/html5) <  3)
+%else
+BuildRequires:  php-composer(endroid/qrcode)    <  2
+BuildRequires:  php-composer(endroid/qrcode)    >= 1.6.5
+BuildRequires:  php-composer(masterminds/html5) <  3
+BuildRequires:  php-composer(masterminds/html5) >= 2.3.0
+%endif
 
 %if %{with_phpfpm}
 Requires:  webserver
@@ -108,9 +112,12 @@ Requires: php-xml
 #        "pear/mail_mime": "~1.10.0",
 #        "pear/net_smtp": "~1.7.1",
 #        "pear/crypt_gpg": "~1.6.0",
-#        "pear/net_sieve": "~1.4.0",
+#        "pear/net_sieve": "~1.4.3",
 #        "roundcube/plugin-installer": "~0.1.6",
+#        "masterminds/html5": "~2.3.0",
 #        "endroid/qrcode": "~1.6.5"
+#        "pear/net_ldap2": "~2.2.0",
+#        "kolab/net_ldap3": "~1.0.6"
 #   not available and doesn't make sense roundcube/plugin-installer
 Requires: php-pear(PEAR)            >= 1.10.1
 Requires: php-pear(Net_Socket)      >= 1.2.1
@@ -119,14 +126,18 @@ Requires: php-pear(Net_IDNA2)       >= 0.2.0
 Requires: php-pear(Mail_Mime)       >= 1.10.0
 Requires: php-pear(Net_SMTP)        >= 1.7.1
 Requires: php-pear(Crypt_GPG)       >= 1.6.0
-Requires: php-pear(Net_Sieve)       >= 1.4.0
-Requires: php-composer(endroid/qrcode) <  2
-Requires: php-composer(endroid/qrcode) >= 1.6.5
-# From composer.json-dist, suggest
-#        "pear/net_ldap2": "~2.2.0 required for connecting to LDAP",
-#        "kolab/Net_LDAP3": "dev-master required for connecting to LDAP"
+Requires: php-pear(Net_Sieve)       >= 1.4.3
 Requires: php-pear(Net_LDAP2)       >= 2.2.0
-Requires: php-composer(kolab/Net_LDAP3)
+Requires: php-composer(kolab/net_ldap3) >= 1.0.6
+%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.3.0 with php-composer(masterminds/html5) <  3)
+%else
+Requires:  php-composer(endroid/qrcode)    <  2
+Requires:  php-composer(endroid/qrcode)    >= 1.6.5
+Requires:  php-composer(masterminds/html5) <  3
+Requires:  php-composer(masterminds/html5) >= 2.3.0
+%endif
 # mailcap for /etc/mime.types
 Requires: mailcap
 # Autoloader
@@ -155,12 +166,14 @@ Suggests: php-gearman
 
 # Bundled JS libraries
 # see https://github.com/roundcube/roundcubemail/blob/master/jsdeps.json
-Provides: bundled(js-jquery) = 3.2.1
+Provides: bundled(js-jquery) = 3.3.1
 Provides: bundled(js-jstz) = 1.0.6
 Provides: bundled(js-publickey)
-Provides: bundled(js-tinymce) = 4.5.7
-Provides: bundled(js-openpgp) = 1.6.2
-Provides: bundled(js-codemirror) = 5.21.0
+Provides: bundled(js-tinymce) = 4.8.2
+Provides: bundled(js-openpgp) = 2.6.2
+Provides: bundled(js-codemirror) = 5.34.0
+Provides: bundled(js-bootstrap) = 4.1.2
+Provides: bundled(js-less) = 2.7.3
 
 
 %description
@@ -175,16 +188,15 @@ CSS 2.
 
 
 %prep
-%setup -q -n roundcubemail-%{version}%{?prever:-%{prever}}
-%patch1 -p1
-%patch2 -p1
+%setup -q -n roundcubemail-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}
+%patch1 -p1 -b .rpm
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
 find . -name \.htaccess -print | xargs rm -f
 
 # drop file from patch
-find . -type f -name '*.orig' -exec rm {} \; -print
+find . -type f -name '*.orig' -o -name '*.rpm' -exec rm {} \; -print
 
 # Wipe bbcode plugin from bundled TinyMCE to make doubleplus sure we cannot
 # be vulnerable to CVE-2012-4230, unaddressed upstream
@@ -204,6 +216,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
 # Composer components
 \Fedora\Autoloader\Dependencies::required([
     '%{_datadir}/php/Endroid/QrCode/autoload.php',
+    '%{_datadir}/php/Masterminds/HTML5/autoload.php',
 ]);
 EOF
 
@@ -273,7 +286,7 @@ rm    %{buildroot}%{roundcubedir}/composer.json-dist
 : Check our autoloader for needed classes
 php -r '
 require "%{buildroot}%{roundcubedir}/vendor/autoload.php";
-$cl = [ "Auth_SASL", "Crypt_GPG", "Mail_mime", "Net_IDNA2", "Net_LDAP2",
+$cl = [ "Auth_SASL", "Crypt_GPG", "Mail_mime", "Net_IDNA2", "Net_LDAP2", "Masterminds\\HTML5",
         "Net_LDAP3", "Net_Sieve", "Net_SMTP", "Net_Socket", "PEAR" , "Endroid\\QrCode\\QrCode" ];
 $ret = 0;
 foreach ($cl as $c) {
@@ -326,6 +339,12 @@ fi
 
 
 %changelog
+* Mon Sep 17 2018 Remi Collet <remi@remirepo.net> - 1.4~beta-1
+- Update to 1.4-beta
+- raise dependency on pear/net_sieve 1.4.3
+- raise dependency on kolab/net_ldap3 1.0.6
+- add dependency on masterminds/html5
+
 * Wed Aug 01 2018 Kevin Fenzi <kevin@scrye.com> - 1.3.7-1
 - Update to 1.3.7. Fixes bug #1609445