Author: glen                         Date: Wed Feb 28 22:27:21 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- update to 1.5.0-RELEASE

---- Files affected:
SPECS:
   php-pear-PEAR.spec (1.128 -> 1.128.2.1) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.128 SPECS/php-pear-PEAR.spec:1.128.2.1
--- SPECS/php-pear-PEAR.spec:1.128      Thu Nov 23 14:53:31 2006
+++ SPECS/php-pear-PEAR.spec    Wed Feb 28 23:27:16 2007
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - bootstrap fails if /usr/share/pear/.lock doesn't exist (just create it as 
644)
 #
 # Conditional build:
 %bcond_with    FHS                     # writable files in /var/lib/pear. 
NEEDS LOTS OF PATCHING AND CONVINCING UPSTREAM
@@ -6,24 +8,24 @@
 # NOTE
 # - macros needed to build this package are in SOURCES/[EMAIL PROTECTED]
 %define                _class          PEAR
-%define                _status         alpha
+%define                _status         stable
 %define                _pearname       %{_class}
-%define                _rc                     a1
 #
 %include       /usr/lib/rpm/macros.php
-%define                _rel    2
 Summary:       PEAR Base System
 Summary(pl):   Podstawowy system PEAR
 Name:          php-pear-%{_pearname}
 Version:       1.5.0
-Release:       1.%{_rc}.%{_rel}
+Release:       2
 Epoch:         1
 License:       PHP 3.0
 Group:         Development/Languages/PHP
-Source0:       http://pear.php.net/get/%{_pearname}-%{version}%{_rc}.tgz
-# Source0-md5: 8f0699f4cf138ac9c6c98a9a9d09133d
+Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
+# Source0-md5: 5902746a1b9def4738fdc2f76333fadb
 Source1:       http://pear.php.net/get/Console_Getopt-1.2.tgz
 # Source1-md5: 8f9ec8253c04350bc01ee7ca941e24b6
+Source2:       http://pear.php.net/get/Structures_Graph-1.0.2.tgz
+# Source2-md5: 2664e2d024048f982e12fad4d1bfbb87
 Patch0:                %{name}-sysconfdir.patch
 Patch5:                %{name}-FHS.patch
 URL:           http://pear.php.net/package/PEAR
@@ -31,7 +33,7 @@
 BuildRequires: php(pcre)
 BuildRequires: php(xml)
 BuildRequires: rpm-php-pearprov >= 4.4.2-30.1
-BuildRequires: rpmbuild(macros) >= 1.324
+BuildRequires: rpmbuild(macros) >= 1.375
 Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Requires:      /usr/bin/php
 Requires:      php(pcre)
@@ -40,6 +42,7 @@
 Requires:      php-pear >= 4:1.0-14
 Requires:      php-pear-Archive_Tar >= 1.1
 Requires:      php-pear-Console_Getopt >= 1.2
+Requires:      php-pear-Structures_Graph >= 1.0.2
 Obsoletes:     php-pear-PEAR-Command
 Obsoletes:     php-pear-PEAR-Frontend-CLI
 Obsoletes:     php-pear-PEAR-OS
@@ -115,9 +118,11 @@
 
 %prep
 %define __build_dir %{_builddir}/%{_class}-%{version}%{?_rc}
-%define        __php_include_path 
%{__build_dir}/%{_class}-%{version}%{?_rc}:%{__build_dir}/%(basename %{SOURCE1} 
.tgz)
+%define        __php_include_path 
%{__build_dir}/%{_class}-%{version}%{?_rc}:%{__build_dir}/%(basename %{SOURCE1} 
.tgz):%{__build_dir}/%(basename %{SOURCE2} .tgz)
 %define __pear php -dmemory_limit=-1 -doutput_buffering=1 
-dinclude_path="%__php_include_path" 
%{__build_dir}/%{_class}-%{version}%{?_rc}/scripts/pearcmd.php
-%pear_package_setup -z -a1 -n %{_pearname}-%{version}%{?_rc}
+
+%setup -q -c -n %{_pearname}-%{version} -a1 -a2
+%pear_package_setup -z -D -n %{_pearname}-%{version}%{?_rc}
 
 %patch0 -p1
 %{?with_FHS:%patch5 -p1}
@@ -245,6 +250,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128.2.1  2007/02/28 22:27:16  glen
+- update to 1.5.0-RELEASE
+
 Revision 1.128  2006/11/23 13:53:31  glen
 - disable memory limit for bootstrap
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.128&r2=1.128.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to