rpms/php-pecl-phar/devel php-pecl-phar.spec,1.1,1.2

[Remi Collet (remi)]

Author: remi

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

Modified Files:
	php-pecl-phar.spec 
Log Message:
use new macros in scriplet and fix license


Index: php-pecl-phar.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-phar/devel/php-pecl-phar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-phar.spec	15 Jul 2007 14:26:49 -0000	1.1
+++ php-pecl-phar.spec	21 Aug 2007 16:25:31 -0000	1.2
@@ -1,14 +1,13 @@
-%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
-%global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 %define pecl_name phar
 
 Summary:      Allows running of complete applications out of .phar files
 Name:         php-pecl-phar
 Version:      1.2.0
-Release:      1%{?dist}
-License:      PHP License
+Release:      2%{?dist}
+License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/%{pecl_name}
 
@@ -94,16 +93,18 @@
 %{__rm} -rf %{buildroot}
 
 
+%if 0%{?pecl_install:1}
 %post
-%{__pecl} install --nodeps --soft --force --register-only --nobuild \
-    %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
 
 
+%if 0%{?pecl_uninstall:1}
 %postun
 if [ $1 -eq 0 ] ; then
-    %{__pecl} uninstall --nodeps --ignore-errors --register-only \
-        %{pecl_name}  >/dev/null || :
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
 fi
+%endif
 
 
 %files
@@ -115,6 +116,10 @@
 %{_bindir}/phar.phar
 
 %changelog
+* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.0-2
+- use new macros in scriplet
+- fix license
+
 * Sun Jul 08 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.0-1
 - initial RPM