rpms/php-pear/devel macros.pear,1.1,1.2 php-pear.spec,1.22,1.23

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/php-pear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683

Modified Files:
	macros.pear php-pear.spec 
Log Message:
* Mon Jul 16 2007 Joe Orton <jorton at redhat.com> 1:1.5.4-3
- add pecl_{un,}install macros to macros.pear (from Remi)



Index: macros.pear
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/macros.pear,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- macros.pear	13 Jul 2006 12:15:27 -0000	1.1
+++ macros.pear	16 Jul 2007 12:55:26 -0000	1.2
@@ -1,11 +1,11 @@
 #
-# Define full path to pear/pecl commands to be used in post/postun scriptlets
+# Define full path to pear/pecl commands to be used in scriptlets:
 #
 %__pear %{_bindir}/pear
 %__pecl %{_bindir}/pecl
 
 #
-# Define pear directories used in php-pear-* spec files
+# Define PEAR directories used in php-pear-* spec files
 #
 %pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)
 %pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)
@@ -13,7 +13,7 @@
 %pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)
 
 #
-# Define pecl directories used in php-pecl-* spec files
+# Define PECL directories used in php-pecl-* spec files:
 #
 %pecl_phpdir  %(%{__pecl} config-get php_dir  2> /dev/null || echo undefined)
 %pecl_docdir  %(%{__pecl} config-get doc_dir  2> /dev/null || echo undefined)
@@ -21,7 +21,13 @@
 %pecl_datadir %(%{__pecl} config-get data_dir 2> /dev/null || echo undefined)
 
 #
-# Define XML directories to store package registration information
+# Define XML directories to store package registration information:
 #
 %pear_xmldir %{pear_phpdir}/.pkgxml
 %pecl_xmldir %{pecl_phpdir}/.pkgxml
+
+#
+# Define macros to be used in scriplets for php-pecl-* spec files:
+#
+%define pecl_install %{__pecl} install --nodeps --soft --force --register-only --nobuild
+%define pecl_uninstall %{__pecl} uninstall --nodeps --ignore-errors --register-only


Index: php-pear.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- php-pear.spec	11 May 2007 13:36:34 -0000	1.22
+++ php-pear.spec	16 Jul 2007 12:55:26 -0000	1.23
@@ -10,7 +10,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.5.4
-Release: 2
+Release: 3
 Epoch: 1
 License: The PHP License v3.0
 Group: Development/Languages
@@ -117,6 +117,9 @@
 %doc LICENSE
 
 %changelog
+* Mon Jul 16 2007 Joe Orton <jorton at redhat.com> 1:1.5.4-3
+- add pecl_{un,}install macros to macros.pear (from Remi)
+
 * Fri May 11 2007 Joe Orton <jorton at redhat.com> 1:1.5.4-2
 - update to 1.5.4