- more macros, fixes in dirs

Changed files:
    php-pear-PEAR.spec -> 1.4

diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index 7239b1dca42b517be65c7a80e61a2e8c8869f7b7..cb36b85c9e34cda732dc7d8a6eb17c509e38962a 100644 (file)
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -1,14 +1,15 @@
 %include       /usr/lib/rpm/macros.php
-%define                _pearname       PEAR
-Summary:       PEAR - main php pear class
-Summary(pl):   PEAR - podstawowa klasa dla php pear
+%define                _class          PEAR
+%define                _pearname       %{_class}
+Summary:       %{_class} - main php pear class
+Summary(pl):   %{_class} - podstawowa klasa dla php pear
 Name:          php-pear-%{_pearname}
 Version:       0.90
 Release:       1
 License:       PHP 2.02
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-PreReq:                php-zlib >= 4.2.0
+BuildRequires: rpm-php-pearprov
 URL:           http://pear.php.net/
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,8 +28,8 @@ Pakiet PEAR zawiara:
 - PEAR installer do tworzenia, dystrybucji i instalowania pakietów
 
 %package Command
-Summary:       PEAR - main php pear class
-Summary(pl):   PEAR - podstawowa klasa dla php pear
+Summary:       %{_class} - main php pear class
+Summary(pl):   %{_class} - podstawowa klasa dla php pear
 Group:         Development/Languages/PHP
 
 %description Command
@@ -38,8 +39,8 @@ Command class for PEAR.
 Klasa Command dla PEARa.
 
 %package OS
-Summary:       PEAR - main php pear class
-Summary(pl):   PEAR - podstawowa klasa dla php pear
+Summary:       %{_class} - main php pear class
+Summary(pl):   %{_class} - podstawowa klasa dla php pear
 Group:         Development/Languages/PHP
 
 %description OS
@@ -55,13 +56,13 @@ Klasa OS_Guess dla PEARa.
 rm -rf $RPM_BUILD_ROOT
 cd %{_pearname}-%{version}
 
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/{%{_pearname}/{Command,Frontend},OS}
+install -d $RPM_BUILD_ROOT%{php_pear_dir}/{%{_class}/{Command,Frontend},OS}
 
-install *.php                  $RPM_BUILD_ROOT%{php_pear_dir}
-install PEAR/*.php             $RPM_BUILD_ROOT%{php_pear_dir}/%{_pearname}
-install PEAR/Command/*.php     $RPM_BUILD_ROOT%{php_pear_dir}/%{_pearname}/Command
-install PEAR/Frontend/*.php    $RPM_BUILD_ROOT%{php_pear_dir}/%{_pearname}/Frontend
-install OS/*.php               $RPM_BUILD_ROOT%{php_pear_dir}/OS
+install *.php                          $RPM_BUILD_ROOT%{php_pear_dir}
+install OS/*.php                       $RPM_BUILD_ROOT%{php_pear_dir}/OS
+install %{_class}/*.php                        $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
+install %{_class}/Command/*.php                $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Command
+install %{_class}/Frontend/*.php       $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Frontend
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,11 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files Command
 %defattr(644,root,root,755)
-%dir %{php_pear_dir}/%{_pearname}
-%dir %{php_pear_dir}/%{_pearname}/Command
-%{php_pear_dir}/%{_pearname}/*.php
-%{php_pear_dir}/%{_pearname}/Command/*.php
-%{php_pear_dir}/%{_pearname}/Frontend/*.php
+%dir %{php_pear_dir}/%{_class}/{Command,Frontend}
+%{php_pear_dir}/%{_class}/*.php
+%{php_pear_dir}/%{_class}/Command/*.php
+%{php_pear_dir}/%{_class}/Frontend/*.php
 
 %files OS
 %defattr(644,root,root,755)