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

[Sergej Pupykin]

    Date: Tuesday, March 14, 2017 @ 13:05:53
  Author: spupykin
Revision: 216245

upgpkg: roundcubemail 1.2.4-1

upd

Modified:
  roundcubemail/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-14 12:43:03 UTC (rev 216244)
+++ PKGBUILD	2017-03-14 13:05:53 UTC (rev 216245)
@@ -2,7 +2,7 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=roundcubemail
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 pkgdesc="A PHP web-based mail client"
 arch=('any')
@@ -16,12 +16,13 @@
 install=roundcubemail.install
 options=('!strip' 'emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/roundcube/roundcubemail/archive/${pkgver/rc/-rc}.tar.gz"
+	"https://getcomposer.org/download/1.4.1/composer.phar"
 	apache.conf)
-sha256sums=('461f958818cd294dcc40a97d0bf30091fe0762906b18653fa9739e16eeba3a5c'
+sha256sums=('91d6c8c8a4ecd5c3c78926c080720733f413640950578efe440b5c769fba59a3'
+            'abd277cc3453be980bb48cbffe9d1f7422ca1ef4bc0b7d035fda87cea4d55cbc'
             'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0')
 
 prepare() {
-#  mv "$srcdir"/roundcubemail-${_commit} "$srcdir"/roundcubemail-${pkgver/rc/-rc}
   cd "$srcdir"/roundcubemail-${pkgver/rc/-rc}
   sed -i \
     -e "s|RCUBE_INSTALL_PATH . 'temp.*|'/var/cache/roundcubemail';|" \
@@ -29,7 +30,7 @@
     config/defaults.inc.php \
     program/lib/Roundcube/rcube_config.php
   mv composer.json-dist composer.json
-  composer install --no-dev
+  php ../composer.phar install --no-dev
 }
 
 package() {
@@ -49,12 +50,8 @@
   install -dm0750 "$pkgdir"/var/{log,cache}/roundcubemail
   install -Dm0644 "$srcdir"/apache.conf "$pkgdir"/etc/webapps/roundcubemail/apache.conf
 
-#  install -dm0755 "$pkgdir"/etc/php/conf.d/
-#  cat <<'EOF' >"$pkgdir"/etc/php/conf.d/$pkgname.ini
-#open_basedir = ${open_basedir}:/etc/webapps/roundcubemail:/usr/share/webapps/roundcubemail:/var/log/roundcubemail:/var/cache/roundcubemail
-#EOF
-
   rm -rf temp logs
+  find "$pkgdir" -name .git -exec rm -rf {} \; || true
 
   sed -i "s|"$srcdir"/roundcubemail-${pkgver/rc/-rc}/vendor/pear-pear.php.net/Console_CommandLine/data|/usr/share/webapps/roundcubemail/vendor/pear-pear.php.net|g" \
     vendor/pear-pear.php.net/Console_CommandLine/Console/CommandLine/XmlParser.php