- updated to 1.6.2

[packages/php-pear-PEAR.git] / php-pear-PEAR.spec

diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index bb04fdd10770cbb78f22bf63c54161329426491c..6e762b8f279ffa3b6f4b94975a84257f244b3392 100644 (file)
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -1,5 +1,8 @@
 # TODO
 # - bootstrap fails if /usr/share/pear/.lock doesn't exist (just create it as 644)
+# - should understand as php extension (php-pear-Auth):
+#   pear/Auth can optionally use package "pecl/vpopmail" (version >= 0.2)
+#   pear/Auth can optionally use package "pecl/kadm5" (version >= 0.2.3)
 #
 # Conditional build:
 %bcond_with    FHS                     # writable files in /var/lib/pear. NEEDS LOTS OF PATCHING AND CONVINCING UPSTREAM
@@ -7,32 +10,33 @@
 # NOTE
 # - macros needed to build this package are in SOURCES/php-pear-build-macros@DEVEL
 %define                _class          PEAR
-%define                _status         alpha
+%define                _status         stable
 %define                _pearname       %{_class}
-%define                _rc                     a1
 #
 %include       /usr/lib/rpm/macros.php
-%define                _rel    4
 Summary:       PEAR Base System
 Summary(pl.UTF-8):     Podstawowy system PEAR
 Name:          php-pear-%{_pearname}
-Version:       1.5.0
-Release:       1.%{_rc}.%{_rel}
+Version:       1.6.2
+Release:       1
 Epoch:         1
 License:       PHP 3.0
 Group:         Development/Languages/PHP
-Source0:       http://pear.php.net/get/%{_pearname}-%{version}%{_rc}.tgz
-# Source0-md5: 8f0699f4cf138ac9c6c98a9a9d09133d
-Source1:       http://pear.php.net/get/Console_Getopt-1.2.tgz
-# Source1-md5: 8f9ec8253c04350bc01ee7ca941e24b6
+Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
+# Source0-md5: 8658f584d0ba2648b795fe8b1d8998c2
+Source1:       http://pear.php.net/get/Console_Getopt-1.2.3.tgz
+# Source1-md5: d7618327f9302a7191893768982de823
+Source2:       http://pear.php.net/get/Structures_Graph-1.0.2.tgz
+# Source2-md5: 2664e2d024048f982e12fad4d1bfbb87
 Patch0:                %{name}-sysconfdir.patch
+Patch1:                %{name}-strict.patch
 Patch5:                %{name}-FHS.patch
 URL:           http://pear.php.net/package/PEAR
 BuildRequires: /usr/bin/php
 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)
@@ -41,6 +45,7 @@ Requires:     php(zlib)
 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
@@ -116,19 +121,19 @@ oraz klasy dla PHP 5:
 
 %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
+%patch1 -p1
 %{?with_FHS:%patch5 -p1}
 
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
 
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{php_pear_dir},%{_bindir}}
-
+%build
 D=$(pwd)
 pearcmd() {
        %{__pear} -c ${D}/pearrc "$@"
@@ -138,9 +143,12 @@ pearcmd config-set data_dir %{php_pear_dir}/data || exit
 pearcmd config-set php_dir %{php_pear_dir} || exit
 pearcmd config-set test_dir %{php_pear_dir}/tests || exit
 pearcmd config-set sig_bin %{_bindir}/gpg || exit
-cp $D/pearrc $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
 
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{php_pear_dir},%{_bindir}}
 %pear_package_install
+cp pearrc $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
 
 install -d $RPM_BUILD_ROOT%{_channelsdir}/.alias
 install -d $RPM_BUILD_ROOT%{_registrydir}/{.channel.{__uri,pecl.php.net},channels/.alias}