[arch-commits] Commit in roundcubemail/trunk (3 files)

[Sergej Pupykin]

    Date: Thursday, June 26, 2014 @ 12:58:09
  Author: spupykin
Revision: 113602

upgpkg: roundcubemail 1.0.1-5

upd

Modified:
  roundcubemail/trunk/PKGBUILD
  roundcubemail/trunk/apache.conf
  roundcubemail/trunk/roundcubemail.install

-----------------------+
 PKGBUILD              |   13 +++++--------
 apache.conf           |    2 +-
 roundcubemail.install |    3 +--
 3 files changed, 7 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-26 10:12:43 UTC (rev 113601)
+++ PKGBUILD	2014-06-26 10:58:09 UTC (rev 113602)
@@ -3,7 +3,7 @@
 
 pkgname=roundcubemail
 pkgver=1.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A PHP web-based mail client"
 arch=('any')
 url="http://www.roundcube.net"
@@ -13,16 +13,16 @@
 backup=('etc/webapps/roundcubemail/.htaccess'
 	'etc/webapps/roundcubemail/apache.conf')
 install=roundcubemail.install
-options=('!strip')
+options=('!strip' 'emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/roundcubemail/roundcubemail-${pkgver/rc/-rc}.tar.gz
 	apache.conf)
 md5sums=('2e1629ea21615005b0a991e591f36363'
-         '9ef887b19632239911b287ce0e270ae8')
+         'f11b17e2a80b383cde4af963fb307541')
 
 prepare() {
   cd ${srcdir}/roundcubemail-${pkgver/rc/-rc}
   sed -i \
-    -e "s|RCUBE_INSTALL_PATH . 'temp.*|'/tmp/roundcubemail';|" \
+    -e "s|RCUBE_INSTALL_PATH . 'temp.*|'/var/cache/roundcubemail';|" \
     -e "s|RCUBE_INSTALL_PATH . 'logs.*|'/var/log/roundcubemail';|" \
     config/defaults.inc.php \
     program/lib/Roundcube/rcube_config.php
@@ -42,11 +42,8 @@
   mv config $pkgdir/etc/webapps/roundcubemail/
   ln -s /etc/webapps/roundcubemail/config config
 
-  install -dm0750 $pkgdir/var/log/roundcubemail
-
+  install -dm0750 $pkgdir/var/{log,cache}/roundcubemail
   install -Dm0644 $srcdir/apache.conf $pkgdir/etc/webapps/roundcubemail/apache.conf
 
   rm -rf temp logs
-  install -dm0755 $pkgdir/usr/lib/tmpfiles.d
-  echo "d /tmp/roundcubemail 0770 http http -" >$pkgdir/usr/lib/tmpfiles.d/roundcube.conf
 }

Modified: apache.conf
===================================================================
--- apache.conf	2014-06-26 10:12:43 UTC (rev 113601)
+++ apache.conf	2014-06-26 10:58:09 UTC (rev 113602)
@@ -3,5 +3,5 @@
     AllowOverride All
     Options FollowSymlinks
     Require all granted
-    php_admin_value open_basedir "/tmp/:/usr/share/webapps/roundcubemail:/etc/webapps/roundcubemail:/usr/share/pear/:/var/log/roundcubemail"
+    php_admin_value open_basedir "/tmp/:/var/cache/roundcubemail:/usr/share/webapps/roundcubemail:/etc/webapps/roundcubemail:/usr/share/pear/:/var/log/roundcubemail"
 </Directory>

Modified: roundcubemail.install
===================================================================
--- roundcubemail.install	2014-06-26 10:12:43 UTC (rev 113601)
+++ roundcubemail.install	2014-06-26 10:58:09 UTC (rev 113602)
@@ -1,6 +1,5 @@
 post_install() {
-  chown -R http:http var/log/roundcubemail
-  systemd-tmpfiles --create roundcube.conf
+  chown -R http:http var/{log,cache}/roundcubemail
 }
 
 post_upgrade() {