rpms/php-pecl-phar/devel phar-make.patch, 1.2, 1.3 php-pecl-phar.spec, 1.5, 1.6

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pecl-phar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30382

Modified Files:
	php-pecl-phar.spec 
Added Files:
	phar-make.patch 
Log Message:
phar-make.patch back

phar-make.patch:

Index: phar-make.patch
===================================================================
RCS file: phar-make.patch
diff -N phar-make.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ phar-make.patch	24 Nov 2007 13:19:13 -0000	1.3
@@ -0,0 +1,17 @@
+--- Makefile.frag.orig	2007-11-23 06:43:13.000000000 +0100
++++ Makefile.frag	2007-11-24 14:05:45.000000000 +0100
+@@ -5,9 +5,12 @@
+ pharcmd: $(all_targets) $(builddir)/phar.php $(builddir)/phar.phar
+ 
+ $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php
+-	$(SAPI_CLI_PATH) $(srcdir)/build_precommand.php > $(builddir)/phar.php
++	php -n -q -d extension_dir=$(builddir)/modules -d extension=phar.so\
++		$(srcdir)/build_precommand.php > $(builddir)/phar.php
+ 
+ $(builddir)/phar.phar: $(builddir)/phar.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php
+-	$(SAPI_CLI_PATH) -dphar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/
++	php -n -q -d extension_dir=$(builddir)/modules -d extension=phar.so -d phar.readonly=0 \
++		-dphar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand \
++		-c auto -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/
+ 	@chmod +x $(builddir)/phar.phar
+ 


Index: php-pecl-phar.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-phar/devel/php-pecl-phar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-phar.spec	24 Nov 2007 10:11:53 -0000	1.5
+++ php-pecl-phar.spec	24 Nov 2007 13:19:13 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:      Allows running of complete applications out of .phar files
 Name:         php-pecl-phar
 Version:      1.2.3
-Release:      1%{?dist}
+Release:      2%{?dist}
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/phar
@@ -14,6 +14,8 @@
 Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source2:      xml2changelog
 
+Patch0:       phar-make.patch
+
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-devel >= 5.2.0, pcre-devel, php-pear
 Requires(post): %{__pecl}
@@ -46,6 +48,8 @@
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 cd %{pecl_name}-%{version}
 
+%patch0 -p0 -b .makepatch
+
 # fix PHP path
 %{__sed} -i -e 's#/usr/local/bin#%{_bindir}#' phar/phar.php
 # need a rebuild (to be signed, with good php path)
@@ -58,7 +62,7 @@
 %configure
 %{__make} %{?_smp_mflags}
 
-%{__make} pharcmd  SAPI_CLI_PATH="%{_bindir}/php -n -q -d extension_dir=modules -d extension=phar.so -d phar.readonly=0"
+%{__make} pharcmd
 
 
 %install
@@ -123,6 +127,9 @@
 
 
 %changelog
+* Sat Nov 23 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.3-2
+- phar-make.patch back
+
 * Fri Nov 23 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.3-1
 - update to 1.2.3