[arch-commits] Commit in php-composer/trunk (PKGBUILD php php.ini)

[Pierre Schmitz]

    Date: Tuesday, December 29, 2015 @ 08:37:42
  Author: pierre
Revision: 257359

upgpkg: php-composer 1.0.0.alpha11-3

Modified:
  php-composer/trunk/PKGBUILD
Deleted:
  php-composer/trunk/php
  php-composer/trunk/php.ini

----------+
 PKGBUILD |   17 +++++++----------
 php      |    3 ---
 php.ini  |   10 ----------
 3 files changed, 7 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-29 07:35:09 UTC (rev 257358)
+++ PKGBUILD	2015-12-29 07:37:42 UTC (rev 257359)
@@ -4,7 +4,7 @@
 pkgname=php-composer
 _tag=1.0.0-alpha11
 pkgver=${_tag/-/.}
-pkgrel=1
+pkgrel=3
 pkgdesc="Dependency Manager for PHP"
 arch=('any')
 license=('MIT')
@@ -12,19 +12,13 @@
 depends=('php')
 makedepends=('git')
 source=("${pkgname}::git+https://github.com/composer/composer.git#tag=${_tag}"
-        "composer-${pkgver}.phar::https://getcomposer.org/download/${_tag}/composer.phar"
-        'php' 'php.ini')
+        "composer-${pkgver}.phar::https://getcomposer.org/download/${_tag}/composer.phar")
 md5sums=('SKIP'
-         '488ca7972e447e0e1b2988f66d8e01e6'
-         '407acec5e2be64bc18c95fadb2ad86d4'
-         '5cc154807e3a7a990657c1c4bcc80149')
+         '488ca7972e447e0e1b2988f66d8e01e6')
 
 prepare() {
 	cd ${srcdir}/${pkgname}
 
-	# Use a php wrapper which is configured with the required modules
-	export PATH=${srcdir}:$PATH
-
 	php ${srcdir}/composer-${pkgver}.phar -n install --no-dev
 }
 
@@ -31,12 +25,15 @@
 build() {
 	cd ${srcdir}/${pkgname}
 
-	bin/compile
+	php -d phar.readonly=Off bin/compile
 }
 
 check() {
 	cd ${srcdir}/${pkgname}
 
+	# check if the upstream build and ours differ
+	diff -q ${srcdir}/composer-${pkgver}.phar composer.phar
+
 	# Install the dev dependencies to run the unit tests
 	bin/composer -n install
 	vendor/bin/phpunit

Deleted: php
===================================================================
--- php	2015-12-29 07:35:09 UTC (rev 257358)
+++ php	2015-12-29 07:37:42 UTC (rev 257359)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/usr/bin/php -nc $(dirname $0)/php.ini ${@}

Deleted: php.ini
===================================================================
--- php.ini	2015-12-29 07:35:09 UTC (rev 257358)
+++ php.ini	2015-12-29 07:37:42 UTC (rev 257359)
@@ -1,10 +0,0 @@
-[PHP]
-memory_limit=-1
-extension=openssl.so
-extension=phar.so
-extension=zip.so
-extension=curl.so
-[Date]
-date.timezone=UTC
-[Phar]
-phar.readonly=Off