rpms/php-pecl-phar/F-8 phar-make.patch, 1.1, 1.2 php-pecl-phar.spec, 1.4, 1.5 sources, 1.4, 1.5
Remi Collet (remi)
fedora-extras-commits at redhat.com
Sat Nov 24 13:29:36 UTC 2007
Author: remi
Update of /cvs/extras/rpms/php-pecl-phar/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30928
Modified Files:
phar-make.patch php-pecl-phar.spec sources
Log Message:
update to 1.2.3
phar-make.patch:
Index: phar-make.patch
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-phar/F-8/phar-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phar-make.patch 31 Aug 2007 12:55:48 -0000 1.1
+++ phar-make.patch 24 Nov 2007 13:29:33 -0000 1.2
@@ -1,20 +1,17 @@
---- Makefile.frag.makepatch 2007-08-30 05:34:34.000000000 +0200
-+++ Makefile.frag 2007-08-31 14:45:52.000000000 +0200
-@@ -2,12 +2,14 @@
- $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re
- $(RE2C) -b -o $(srcdir)/phar_path_check.c $(srcdir)/phar_path_check.re)
-
--pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
-+pharcmd: $(all_targets) $(builddir)/phar.php $(builddir)/phar.phar
+--- 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
-- php $(srcdir)/build_precommand.php > $(builddir)/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
-- php -d phar.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/
+- $(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 \
-+ $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/
++ -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/F-8/php-pecl-phar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pecl-phar.spec 8 Oct 2007 05:31:36 -0000 1.4
+++ php-pecl-phar.spec 24 Nov 2007 13:29:33 -0000 1.5
@@ -5,14 +5,13 @@
Summary: Allows running of complete applications out of .phar files
Name: php-pecl-phar
-Version: 1.2.2
-Release: 1%{?dist}
+Version: 1.2.3
+Release: 2%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/phar
Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-
Source2: xml2changelog
Patch0: phar-make.patch
@@ -48,15 +47,21 @@
%setup -c -q
%{_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)
+%{__rm} -f phar.phar
+
+
%build
cd %{pecl_name}-%{version}
phpize
%configure
%{__make} %{?_smp_mflags}
-# Build the phar command (a phar application)
%{__make} pharcmd
@@ -122,8 +127,14 @@
%changelog
+* Sat Nov 24 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
+
* Mon Oct 08 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.2-1
-- update to 1.2.1
+- update to 1.2.2
* Thu Aug 30 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.1-1
- update to 1.2.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-phar/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Oct 2007 05:31:36 -0000 1.4
+++ sources 24 Nov 2007 13:29:33 -0000 1.5
@@ -1 +1 @@
-9bc6edbc3bbb47df947c9952235dd22f phar-1.2.2.tgz
+b2b81eebc715044d7793643a626e9d51 phar-1.2.3.tgz
More information about the fedora-extras-commits
mailing list