- adjust macro names as dirname is reserved

SILENT: svn-revision: 692014
This commit is contained in:
adamw 2011-07-28 05:09:04 +00:00 committed by adamw
parent c52fe8fb4a
commit 86a0413c18

View file

@ -6,12 +6,12 @@
%define pre RC6 %define pre RC6
%if %pre %if %pre
%define release %{mkrel 0.%pre.%rel} %define release %{mkrel 0.%pre.%rel}
%define tarname %{upstream_name}-%{version}%{pre}.tgz %define distname %{upstream_name}-%{version}%{pre}.tgz
%define dirname %{upstream_name}-%{version}%{pre} %define pathname %{upstream_name}-%{version}%{pre}
%else %else
%define release %{mkrel %rel} %define release %{mkrel %rel}
%define tarname %{upstream_name}-%{version}.tgz %define distname %{upstream_name}-%{version}.tgz
%define dirname %{upstream_name}-%{version} %define pathname %{upstream_name}-%{version}
%endif %endif
Name: php-pear-%{upstream_name} Name: php-pear-%{upstream_name}
@ -21,7 +21,7 @@ Summary: WebDAV Server Baseclass
License: PHP License License: PHP License
Group: Development/PHP Group: Development/PHP
URL: http://pear.php.net/package/HTTP_WebDAV_Server/ URL: http://pear.php.net/package/HTTP_WebDAV_Server/
Source0: http://download.pear.php.net/package/%{tarname} Source0: http://download.pear.php.net/package/%{distname}
Requires(post): php-pear Requires(post): php-pear
Requires(preun): php-pear Requires(preun): php-pear
Requires: php-pear Requires: php-pear
@ -38,12 +38,12 @@ implementation.
%prep %prep
%setup -q -c %setup -q -c
mv package.xml %{dirname}/%{upstream_name}.xml mv package.xml %{pathname}/%{upstream_name}.xml
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
cd %{dirname} cd %{pathname}
pear install --nodeps --packagingroot %{buildroot} %{upstream_name}.xml pear install --nodeps --packagingroot %{buildroot} %{upstream_name}.xml
rm -rf %{buildroot}%{_datadir}/pear/.??* rm -rf %{buildroot}%{_datadir}/pear/.??*
@ -76,10 +76,10 @@ fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc %{dirname}/AUTHORS %doc %{pathname}/AUTHORS
%doc %{dirname}/COPYING %doc %{pathname}/COPYING
%doc %{dirname}/EXPERIMENTAL %doc %{pathname}/EXPERIMENTAL
%doc %{dirname}/TODO %doc %{pathname}/TODO
%doc %{dirname}/README %doc %{pathname}/README
%{_datadir}/pear/%{_class} %{_datadir}/pear/%{_class}
%{_datadir}/pear/packages/%{upstream_name}.xml %{_datadir}/pear/packages/%{upstream_name}.xml