Up to 1.3.6

diff --git a/roundcubemail-config.patch b/roundcubemail-config.patch
index 1dffca67ad24a0a07f5e119b1bb021b92332e1a0..6e1c813398f410c8a262055fcccced024e54565b 100644 (file)
--- a/roundcubemail-config.patch
+++ b/roundcubemail-config.patch
@@ -1,15 +1,17 @@
---- roundcubemail-1.0.8-dep/config/defaults.inc.php~   2015-12-23 10:52:43.000000000 +0200
-+++ roundcubemail-1.0.8-dep/config/defaults.inc.php    2016-01-18 15:21:12.144699738 +0200
-@@ -309,10 +309,10 @@
- 
- // use this folder to store log files (must be writeable for apache user)
+diff -urN roundcube-1.3.4-orig/config/defaults.inc.php roundcubemail-1.3.4/config/defaults.inc.php
+--- roundcube-1.3.4-orig/config/defaults.inc.php        2018-01-14 14:01:32.000000000 +0100
++++ roundcubemail-1.3.4/config/defaults.inc.php 2018-03-13 21:54:39.332735256 +0100
+@@ -382,11 +382,11 @@
+ // use this folder to store log files
+ // must be writeable for the user who runs PHP process (Apache user if mod_php is being used)
  // This is used by the 'file' log driver.
 -$config['log_dir'] = RCUBE_INSTALL_PATH . 'logs/';
 +$config['log_dir'] = '/var/log/roundcube';
  
- // use this folder to store temp files (must be writeable for apache user)
+ // use this folder to store temp files
+ // must be writeable for the user who runs PHP process (Apache user if mod_php is being used)
 -$config['temp_dir'] = RCUBE_INSTALL_PATH . 'temp/';
 +$config['temp_dir'] = '/var/lib/roundcube';
  
  // expire files in temp_dir after 48 hours
- // possible units: s, m, h, d, w
+ // possible units: s, m, h, d, w
\ No newline at end of file

diff --git a/roundcubemail.spec b/roundcubemail.spec
index 3462aca3c9d99a0624c439fe1cfa96bd6b79e942..4a514784611d9853dc3395b00f855a24a2b1134e 100644 (file)
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -10,17 +10,17 @@
 %bcond_with    password_anon_ldap_bind # apply with password-anon-ldap-bind patch.
 
 %define                rcpfa_ver       1.0.5
-%define                php_min_version 5.3.7
+%define                php_min_version 5.4.0
 %include       /usr/lib/rpm/macros.php
 Summary:       RoundCube Webmail
 Summary(pl.UTF-8):     RoundCube Webmail - poczta przez WWW
 Name:          roundcubemail
-Version:       1.0.12
-Release:       2
+Version:       1.3.6
+Release:       1
 License:       GPL v3+
 Group:         Applications/Mail
-Source0:       https://github.com/roundcube/%{name}/releases/download/%{version}/%{name}-%{version}-dep.tar.gz
-# Source0-md5: 675b86f5ad2b67ac064a981d79ac3172
+Source0:       https://github.com/roundcube/%{name}/releases/download/%{version}/%{name}-%{version}-complete.tar.gz
+# Source0-md5: 3a16df41c1b28c098db7614f65d2fd84
 Source1:       apache.conf
 Source2:       %{name}.logrotate
 Source3:       lighttpd.conf
@@ -48,6 +48,7 @@ Requires:     php(imap)
 Requires:      php(json)
 Requires:      php(mbstring)
 Requires:      php(mcrypt)
+Requires:      php(openssl)
 Requires:      php(pcre)
 Requires:      php(pdo)
 Requires:      php(session)
@@ -55,10 +56,9 @@ Requires:    php(simplexml)
 Requires:      php(sockets)
 Requires:      php(spl)
 Requires:      php(xml)
-Requires:      php-pear-DB
-Requires:      php-pear-Mail_Mime >= 1.8.1
+Requires:      php-pear-Mail_Mime >= 1.10.0
 Requires:      php-pear-Net_IDNA2 >= 0.1.1
-Requires:      php-pear-Net_SMTP
+Requires:      php-pear-Net_SMTP >= 1.7.1
 Requires:      rpm-whiteout >= 1.22
 Requires:      webapps
 Requires:      webserver(alias)
@@ -68,6 +68,7 @@ Requires(post):       openssl-tools
 Suggests:      php(exif)
 Suggests:      php(fileinfo)
 Suggests:      php(gd)
+Suggests:      php(Imagick)
 Suggests:      php(intl)
 Suggests:      php(openssl)
 Suggests:      php(xml)
@@ -77,10 +78,10 @@ Suggests:   php-pear-Auth_SASL >= 1.0.6
 Suggests:      php(pdo-pgsql)
 Suggests:      php(pdo-mysql)
 Suggests:      php(pdo-sqlite)
-Suggests:      php-pear-Crypt_GPG >= 1.2.0
+Suggests:      php-pear-Crypt_GPG >= 1.6.0
 Suggests:      php-pear-Net_LDAP2
 Suggests:      php-pear-Net_Sieve >= 1.3.2
-Suggests:      php-pear-Net_Socket
+Suggests:      php-pear-Net_Socket >= 1.0.12
 Obsoletes:     roundcube-plugin-jqueryui
 Obsoletes:     roundcubemail-skin-default
 Conflicts:     apache-base < 2.4.0-1
@@ -162,7 +163,7 @@ Larry skin for RoundCube Webmail.
 Skórka Larry dla RoundCube Webmaila.
 
 %prep
-%setup -q -n %{name}-%{version}-dep %{?with_postfixadmin:-a 4}
+%setup -q -n %{name}-%{version} %{?with_postfixadmin:-a 4}
 %patch0 -p1
 %if %{with spamfilter}
 %patch1 -p1
@@ -193,9 +194,6 @@ done
 rm bin/jsshrink.sh
 rm bin/cssshrink.sh
 
-# pear package junk
-rm -v plugins/*/package.xml
-
 mv config/config.inc.php{.sample,}
 
 %if %{with postfixadmin}