- 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 e705c47be17df24df1f8e06781def3e325ba653a..6e762b8f279ffa3b6f4b94975a84257f244b3392 100644 (file)
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -17,18 +17,19 @@
 Summary:       PEAR Base System
 Summary(pl.UTF-8):     Podstawowy system PEAR
 Name:          php-pear-%{_pearname}
-Version:       1.6.1
+Version:       1.6.2
 Release:       1
 Epoch:         1
 License:       PHP 3.0
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: 1476f0ec3917d68e3d7af1346a9a7b89
-Source1:       http://pear.php.net/get/Console_Getopt-1.2.tgz
-# Source1-md5: 8f9ec8253c04350bc01ee7ca941e24b6
+# 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
@@ -127,14 +128,12 @@ oraz klasy dla PHP 5:
 %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 "$@"
@@ -144,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}