- use %pearname

Changed files:
    php-pear.spec -> 1.44

diff --git a/php-pear.spec b/php-pear.spec
index 0f06152f9145e6a3e1958f725934a17706e1f8b2..d6bae1bce1aa83da227487eac1848d22be289ed2 100644 (file)
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -7,24 +7,22 @@
 #
 #   This file exists just for a reference when updating existing packages
 #
+%define                status          stable
+%define                pearname        class_subclass
 %include       /usr/lib/rpm/macros.php
-%define                _class          class
-%define                _subclass       subclass
-%define                _status         stable
-%define                _pearname       %{_class}_%{_subclass}
-Summary:       %{_pearname} -
-Summary(pl.UTF-8):     %{_pearname} -
-Name:          php-pear-%{_pearname}
+Summary:       %{pearname} -
+Summary(pl.UTF-8):     %{pearname} -
+Name:          php-pear-%{pearname}
 Version:       0.2.0
 Release:       1
 License:       PHP 2.02
 Group:         Development/Languages/PHP
-Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
+Source0:       http://pear.php.net/get/%{pearname}-%{version}.tgz
 URL:           http://pear.php.net/package/Class_Subclass/
 BuildRequires: php-packagexml2cl
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
-BuildRequires: rpmbuild(macros) >= 1.593
+BuildRequires: rpmbuild(macros) >= 1.580
 Requires:      php-pear
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,26 +36,26 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 ...
 
-In PEAR status of this package is: %{_status}.
+In PEAR status of this package is: %{status}.
 
 %description -l pl.UTF-8
 ...
 
-Ta klasa ma w PEAR status: %{_status}.
+Ta klasa ma w PEAR status: %{status}.
 
 %package tests
-Summary:       Tests for PEAR::%{_pearname}
-Summary(pl.UTF-8):     Testy dla PEAR::%{_pearname}
+Summary:       Tests for PEAR::%{pearname}
+Summary(pl.UTF-8):     Testy dla PEAR::%{pearname}
 Group:         Development/Languages/PHP
 Requires:      %{name} = %{version}-%{release}
 AutoProv:      no
 AutoReq:       no
 
 %description tests
-Tests for PEAR::%{_pearname}.
+Tests for PEAR::%{pearname}.
 
 %description tests -l pl.UTF-8
-Testy dla PEAR::%{_pearname}.
+Testy dla PEAR::%{pearname}.
 
 %prep
 %pear_package_setup
@@ -68,39 +66,39 @@ echo '%{name} can optionally use PHP extension "mhash"' >> install.log
 ## docs fixups
 
 # pear/docs -> docs
-install -d docs/%{_pearname}
-mv ./%{php_pear_dir}/%{_class}/doc/* docs/%{_pearname}
+install -d docs/%{pearname}
+mv ./%{php_pear_dir}/%{_class}/doc/* docs/%{pearname}
 
 # pear/docs -> docs
-install -d docs/%{_pearname}
-mv ./%{php_pear_dir}/docs/%{_pearname}/* docs/%{_pearname}
+install -d docs/%{pearname}
+mv ./%{php_pear_dir}/docs/%{pearname}/* docs/%{pearname}
 
 # pear/data/docs -> docs
-install -d docs/%{_pearname}
-mv ./%{php_pear_dir}/data/%{_pearname}/docs/* docs/%{_pearname}
+install -d docs/%{pearname}
+mv ./%{php_pear_dir}/data/%{pearname}/docs/* docs/%{pearname}
 
 # tests fixups
 # class/test -> tests
-install -d ./%{php_pear_dir}/tests/%{_pearname}
-mv ./%{php_pear_dir}/{%{_class}/test/*,tests/%{_pearname}}
+install -d ./%{php_pear_dir}/tests/%{pearname}
+mv ./%{php_pear_dir}/{%{_class}/test/*,tests/%{pearname}}
 
 # pear/tests/pearname/tests -> pear/tests/pearname
-mv ./%{php_pear_dir}/tests/%{_pearname}/{tests/*,}
-rmdir ./%{php_pear_dir}/tests/%{_pearname}/tests
+mv ./%{php_pear_dir}/tests/%{pearname}/{tests/*,}
+rmdir ./%{php_pear_dir}/tests/%{pearname}/tests
 
 # docs/tests -> tests
-install -d ./%{php_pear_dir}/tests/%{_pearname}
-mv docs/%{_pearname}/tests/* ./%{php_pear_dir}/tests/%{_pearname}
+install -d ./%{php_pear_dir}/tests/%{pearname}
+mv docs/%{pearname}/tests/* ./%{php_pear_dir}/tests/%{pearname}
 
-# tests -> tests/%{_pearname}
-install -d ./%{php_pear_dir}/tests/%{_pearname}
-mv ./%{php_pear_dir}/tests/{*,%{_pearname}}
+# tests -> tests/%{pearname}
+install -d ./%{php_pear_dir}/tests/%{pearname}
+mv ./%{php_pear_dir}/tests/{*,%{pearname}}
 
 # examples fixups
 mv ./%{php_pear_dir}/examples .
 mv ./%{php_pear_dir}/%{_class}/examples .
-mv docs/%{_pearname}/examples .
-mv docs/%{_pearname}/docs/examples .
+mv docs/%{pearname}/examples .
+mv docs/%{pearname}/docs/examples .
 
 %build
 packagexml2cl package.xml > ChangeLog
@@ -127,16 +125,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog install.log optional-packages.txt
-%doc docs/%{_pearname}/docs/*
+%doc docs/%{pearname}/docs/*
 %attr(755,root,root) %{_bindir}/*
 %{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/.registry/.channel.*/*.reg
-%{php_pear_dir}/%{_class}/*.php
+%{php_pear_dir}/Class/*.php
 
-%{php_pear_dir}/data/%{_pearname}
+%{php_pear_dir}/data/%{pearname}
 
 %{_examplesdir}/%{name}-%{version}
 
 %files tests
 %defattr(644,root,root,755)
-%{php_pear_dir}/tests/%{_pearname}
+%{php_pear_dir}/tests/%{pearname}