rpms/php-pear/devel php-pear-1.4.5-template-fixes.patch, 1.1, 1.2 php-pear-1.4.5-template-postun.patch, 1.1, 1.2 php-pear.spec, 1.7, 1.8 sources, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/php-pear/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12179

Modified Files:
	php-pear-1.4.5-template-fixes.patch 
	php-pear-1.4.5-template-postun.patch php-pear.spec sources 
Log Message:
* Mon Jan 30 2006 Joe Orton <jorton at redhat.com> 1:1.4.6-1
- update to 1.4.6
- require php >= 5.1.0 (#178821)


php-pear-1.4.5-template-fixes.patch:
 template.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

Index: php-pear-1.4.5-template-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/php-pear-1.4.5-template-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-1.4.5-template-fixes.patch	13 Jan 2006 11:26:56 -0000	1.1
+++ php-pear-1.4.5-template-fixes.patch	30 Jan 2006 15:47:59 -0000	1.2
@@ -1,29 +1,13 @@
-This patch rolls up:
-
-- php-pear-1.4.5-rh-namingconvs.patch
-- php-pear-1.4.5-template-docfix.patch
-
---- template.spec	2005-12-30 10:52:57.000000000 +0000
-+++ template.spec	2005-12-30 10:58:49.000000000 +0000
+--- template.spec.146	2006-01-13 13:22:05.000000000 +0000
++++ template.spec	2006-01-13 13:29:35.000000000 +0000
 @@ -1,3 +1,5 @@
-+%define peardir %{_datadir}/pear
++%define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear)
 +
  Summary: PEAR: @summary@
  Name: @rpm_package@
  Version: @version@
-@@ -8,7 +10,6 @@
- BuildRoot: %{_tmppath}/%{name}-root
- URL: http://@master_server@/package/@package@
- Prefix: %{_prefix}
--#Docdir: @doc_dir@/@package@
- BuildArchitectures: @arch@
- @extra_headers@
- 
-@@ -17,13 +18,14 @@
- 
- %prep
- rm -rf %{buildroot}/*
-+%setup -c -T
+@@ -19,11 +21,11 @@
+ %setup -c -T
  # XXX Source files location is missing here in pear cmd
  pear -v -c %{buildroot}/pearrc \
 -        -d php_dir=%{_libdir}/php/pear \
@@ -37,25 +21,16 @@
          -d ext_dir=%{_libdir} \@extra_config@
          -s
  
-@@ -50,14 +52,15 @@
+@@ -50,9 +52,9 @@
  pear -c %{buildroot}/pearrc install --nodeps -R %{buildroot} \
          $RPM_SOURCE_DIR/@package at -%{version}.tgz
  rm %{buildroot}/pearrc
 -rm %{buildroot}/%{_libdir}/php/pear/.filemap
 -rm %{buildroot}/%{_libdir}/php/pear/.lock
 -rm -rf %{buildroot}/%{_libdir}/php/pear/.registry
--if [ -d "%{buildroot}/docs/@package@/doc" ]; then
--    rm -rf $RPM_BUILD_DIR/doc
--    mv %{buildroot}/docs/@package@/doc $RPM_BUILD_DIR
 +rm %{buildroot}/%{peardir}/.filemap
 +rm %{buildroot}/%{peardir}/.lock
 +rm -rf %{buildroot}/%{peardir}/.registry
-+
-+if [ "@doc_files@" != "" ]; then
-+    mv %{buildroot}/docs/@package@/* .
-     rm -rf %{buildroot}/docs
- fi
-+
- mkdir -p %{buildroot}@rpm_xml_dir@
- tar -xzf $RPM_SOURCE_DIR/@package at -%{version}.tgz package at package2xml@.xml
- cp -p package at package2xml@.xml %{buildroot}@rpm_xml_dir@/@package at .xml
+ if [ "@doc_files@" != "" ]; then
+      mv %{buildroot}/docs/@package@/* .
+      rm -rf %{buildroot}/docs

php-pear-1.4.5-template-postun.patch:
 template.spec |    1 -
 1 files changed, 1 deletion(-)

Index: php-pear-1.4.5-template-postun.patch
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/php-pear-1.4.5-template-postun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-1.4.5-template-postun.patch	13 Jan 2006 11:26:56 -0000	1.1
+++ php-pear-1.4.5-template-postun.patch	30 Jan 2006 15:47:59 -0000	1.2
@@ -7,4 +7,4 @@
 -    rm @rpm_xml_dir@/@package at .xml
  fi
  
- 
+


Index: php-pear.spec
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pear.spec	13 Jan 2006 11:26:56 -0000	1.7
+++ php-pear.spec	30 Jan 2006 15:47:59 -0000	1.8
@@ -5,8 +5,8 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.4.5
-Release: 6
+Version: 1.4.6
+Release: 1
 Epoch: 1
 License: PHP
 Group: System
@@ -29,6 +29,7 @@
 Provides: php-pear(Console_Getopt) = 1.2
 Provides: php-pear(PEAR) = %{version}
 Provides: php-pear(XML_RPC) = %{xmlrpcver}
+Requires: php >= 5.1.0-1
 
 %description
 PEAR is a framework and distribution system for reusable PHP
@@ -94,6 +95,10 @@
 %config %{_sysconfdir}/pear.conf
 
 %changelog
+* Mon Jan 30 2006 Joe Orton <jorton at redhat.com> 1:1.4.6-1
+- update to 1.4.6
+- require php >= 5.1.0 (#178821)
+
 * Fri Dec 30 2005 Tim Jackson <tim at timj.co.uk> 1:1.4.5-6
 - Patches to fix "pear makerpm"
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 17:15:43 -0000	1.3
+++ sources	30 Jan 2006 15:47:59 -0000	1.4
@@ -1,2 +1,2 @@
 48a9334065e24afdf7a623046eae9d78  XML_RPC-1.4.4.tgz
-9c826173d7aa0b4b58ab62d817431a4f  install-pear-nozlib-1.4.5.phar
+2d10cdab58239fd738cb1b1d5a5047df  install-pear-nozlib-1.4.6.phar