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

[Pierre Schmitz]

    Date: Saturday, November 21, 2015 @ 19:11:49
  Author: pierre
Revision: 251788

upgpkg: php-composer 1.0.0.alpha11-1

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

----------+
 PKGBUILD |   46 ++++++++++++++++++----------------------------
 php      |    3 +++
 php.ini  |    2 --
 3 files changed, 21 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-21 16:34:27 UTC (rev 251787)
+++ PKGBUILD	2015-11-21 18:11:49 UTC (rev 251788)
@@ -2,53 +2,44 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=php-composer
-pkgver=1.0.0.alpha10.465
+_tag=1.0.0-alpha11
+pkgver=${_tag/-/.}
 pkgrel=1
 pkgdesc="Dependency Manager for PHP"
 arch=('any')
 license=('MIT')
-url='http://getcomposer.org/'
-depends=('php' 'php-intl')
+url='https://getcomposer.org/'
+depends=('php')
 makedepends=('git')
-checkdepends=('mercurial')
-source=("${pkgname}::git+https://github.com/composer/composer.git"
-        "composer-${pkgver}.phar::https://getcomposer.org/composer.phar"
-        'php.ini')
-backup=('usr/share/php-composer/php.ini')
+source=("${pkgname}::git+https://github.com/composer/composer.git#tag=${_tag}"
+        "composer-${pkgver}.phar::https://getcomposer.org/download/${_tag}/composer.phar"
+        'php' 'php.ini')
 md5sums=('SKIP'
-         'bc7ca705316637ca93b49860926eed98'
-         'b31326c352763328dca0a567a67609ab')
+         '488ca7972e447e0e1b2988f66d8e01e6'
+         '407acec5e2be64bc18c95fadb2ad86d4'
+         '5cc154807e3a7a990657c1c4bcc80149')
 
-pkgver() {
+prepare() {
 	cd ${srcdir}/${pkgname}
 
-	local _tag=$(git tag -l --sort -version:refname | head -1)
-	echo "${_tag}.$(git rev-list ${_tag}.. --count)" | sed 's/-/./g'
-}
+	# Use a php wrapper which is configured with the required modules
+	export PATH=${srcdir}:$PATH
 
-prepare() {
-	cd ${srcdir}/${pkgname}
-
-	sed "s~^#!/usr/bin/env php~#!/usr/bin/php -nc/usr/share/${pkgname}/php.ini~g" -i src/Composer/Compiler.php
-	sed "s~php bin/composer~php -nc/usr/share/${pkgname}/php.ini bin/composer~g" -i bin/compile
-	/usr/bin/php -nc ${srcdir}/php.ini ${srcdir}/composer-${pkgver}.phar -n install --no-dev
+	php ${srcdir}/composer-${pkgver}.phar -n install --no-dev
 }
 
 build() {
 	cd ${srcdir}/${pkgname}
 
-	/usr/bin/php -nc ${srcdir}/php.ini bin/compile
+	bin/compile
 }
 
 check() {
 	cd ${srcdir}/${pkgname}
 
-	git config --global user.email "${USER}@${HOST}"
-	git config --global user.name "${USER}"
-
-	# install the dev dependencies to run the unit tests
-	/usr/bin/php -nc ${srcdir}/php.ini bin/composer install
-	/usr/bin/php -nc ${srcdir}/php.ini vendor/bin/phpunit
+	# Install the dev dependencies to run the unit tests
+	bin/composer -n install
+	vendor/bin/phpunit
 }
 
 package() {
@@ -55,6 +46,5 @@
 	cd ${srcdir}/${pkgname}
 
 	install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-	install -Dm644 ${srcdir}/php.ini ${pkgdir}/usr/share/php-composer/php.ini
 	install -Dm755 composer.phar ${pkgdir}/usr/bin/composer
 }

Added: php
===================================================================
--- php	                        (rev 0)
+++ php	2015-11-21 18:11:49 UTC (rev 251788)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/bin/php -nc $(dirname $0)/php.ini ${@}


Property changes on: php-composer/trunk/php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: php.ini
===================================================================
--- php.ini	2015-11-21 16:34:27 UTC (rev 251787)
+++ php.ini	2015-11-21 18:11:49 UTC (rev 251788)
@@ -3,9 +3,7 @@
 extension=openssl.so
 extension=phar.so
 extension=zip.so
-extension=bz2.so
 extension=curl.so
-extension=intl.so
 [Date]
 date.timezone=UTC
 [Phar]