commit 86c883cfcee35a0677e6a671dc626e39952cb231
Author: Elan Ruusamäe <[email protected]>
Date: Thu Jan 3 00:10:07 2013 +0200
fix path to composer
composer-path.patch | 11 +++++++++++
php-phing.spec | 2 ++
2 files changed, 13 insertions(+)
---
diff --git a/php-phing.spec b/php-phing.spec
index 4634b5a..976f358 100644
--- a/php-phing.spec
+++ b/php-phing.spec
@@ -14,6 +14,7 @@ Group: Development/Languages/PHP
Source0: http://pear.phing.info/get/phing-%{version}.tgz
# Source0-md5: 6ddc17bceb5d983f7cf677794a17b3b8
Source1: %{pkgname}.sh
+Patch0: composer-path.patch
URL: http://www.phing.info/
BuildRequires: php-channel(pear.phing.info)
BuildRequires: php-pear >= 4:1.3.8
@@ -81,6 +82,7 @@ PEAR i wiele więcej.
%prep
%pear_package_setup -d data_dir=%{_appdir}/data
+%patch0 -p1
# 2.4.4 release tarball contains .rej and .orig files junk
find '(' -name '*~' -o -name '*.orig' -o -name '*.rej' ')' -print0 | xargs -0
-r -l512 rm -f
diff --git a/composer-path.patch b/composer-path.patch
new file mode 100644
index 0000000..1bbf95f
--- /dev/null
+++ b/composer-path.patch
@@ -0,0 +1,11 @@
+--- phing-2.4.14/usr/share/pear/phing/tasks/ext/ComposerTask.php~
2013-01-03 00:00:01.787983874 +0200
++++ phing-2.4.14/usr/share/pear/phing/tasks/ext/ComposerTask.php
2013-01-03 00:07:48.000000000 +0200
+@@ -58,7 +58,7 @@
+ *
+ * @var string path to Composer application
+ */
+- private $composer = 'composer.phar';
++ private $composer = '/usr/bin/composer';
+
+ public function __construct()
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-phing.git/commitdiff/86c883cfcee35a0677e6a671dc626e39952cb231
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
