rpms/php-pecl-phar/devel phar-make.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 php-pecl-phar.spec, 1.2, 1.3 sources, 1.2, 1.3

[Remi Collet (remi)]

Author: remi

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

Modified Files:
	.cvsignore php-pecl-phar.spec sources 
Added Files:
	phar-make.patch 
Log Message:
    update to 1.2.1

phar-make.patch:

--- NEW FILE phar-make.patch ---
--- 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
 
 $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php
-	php $(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/
+	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/
 	@chmod +x $(builddir)/phar.phar
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-phar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jul 2007 14:26:49 -0000	1.2
+++ .cvsignore	31 Aug 2007 12:55:48 -0000	1.3
@@ -1 +1 @@
-phar-1.2.0.tgz
+phar-1.2.1.tgz


Index: php-pecl-phar.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-phar/devel/php-pecl-phar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-phar.spec	21 Aug 2007 16:25:31 -0000	1.2
+++ php-pecl-phar.spec	31 Aug 2007 12:55:48 -0000	1.3
@@ -5,16 +5,18 @@
 
 Summary:      Allows running of complete applications out of .phar files
 Name:         php-pecl-phar
-Version:      1.2.0
-Release:      2%{?dist}
+Version:      1.2.1
+Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
-URL:          http://pecl.php.net/package/%{pecl_name}
+URL:          http://pecl.php.net/package/phar
 
 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}
@@ -41,9 +43,12 @@
 When PECL extension hash is available then SHA-256 and SHA-512 signatures
 are supported as well.
 
+
 %prep 
 %setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+cd %{pecl_name}-%{version}
+%patch0 -p0 -b .makepatch
 
 %build
 cd %{pecl_name}-%{version}
@@ -52,9 +57,8 @@
 %{__make} %{?_smp_mflags}
 
 # Build the phar command (a phar application)
-php -n -d extension_dir=modules -d extension=phar.so \
-    -d phar.readonly=0 \
-    ./phar.php pack -f ../phar.phar -s phar/phar.php phar
+%{__make} pharcmd
+
 
 %install
 cd %{pecl_name}-%{version}
@@ -73,13 +77,14 @@
 EOF
 
 # Install XML package description
-# use %name rather than %pecl_name to avoid conflict with pear extensions
+# use 'name' rather than 'pecl_name' to avoid conflict with pear extensions
 %{__mkdir_p} %{buildroot}%{pecl_xmldir}
 %{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 # Install the command
 %{__mkdir_p} %{buildroot}%{_bindir}
-%{__install} -m 755 ../phar.phar %{buildroot}%{_bindir}/phar.phar
+%{__install} -m 755 ./phar.phar %{buildroot}%{_bindir}/phar.phar
+
 
 %check
 cd %{pecl_name}-%{version}
@@ -115,7 +120,13 @@
 %{pecl_xmldir}/%{name}.xml
 %{_bindir}/phar.phar
 
+
 %changelog
+* Thu Aug 30 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.1-1
+- update to 1.2.1
+- use "make pharcmd" 
+- add phar-make.patch (use phar.so from build tree)
+
 * Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.0-2
 - use new macros in scriplet
 - fix license


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-phar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jul 2007 14:26:49 -0000	1.2
+++ sources	31 Aug 2007 12:55:48 -0000	1.3
@@ -1 +1 @@
-bafae732137b0b8977e289910a36f438  phar-1.2.0.tgz
+d057af8c7f12332370ac6af045bcd459  phar-1.2.1.tgz