packages: rpm-build-macros/rpm.macros - allow %{pearname} when %{_pearname}...

[glen]

Author: glen                         Date: Fri Oct  1 13:26:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow %{pearname} when %{_pearname} is missing

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.579 -> 1.580) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.579 packages/rpm-build-macros/rpm.macros:1.580
--- packages/rpm-build-macros/rpm.macros:1.579	Mon Aug 30 18:01:41 2010
+++ packages/rpm-build-macros/rpm.macros	Fri Oct  1 15:26:02 2010
@@ -1360,7 +1360,7 @@
 #	%%pear_package_setup ...
 #
 # -a #   - also unpack SOURCE#. for PEAR bootstrapping
-# -n FMT - create builddir with FMT, instead of default %%{_pearname}-%%{version}
+# -n FMT - create builddir with FMT, instead of default %%{pearname}-%%{version}
 # -z     - unpack pear package and let pear use package.xml (not tarball) for install. for PEAR bootstrapping
 # -D     - pass -D to %setup (so the build dir is not removed)
 # -c     - register channel from local channel.xml file
@@ -1422,7 +1422,7 @@
 # as it's displayed to user after package install. and adding additional gzip
 # dep is just waste ;)
 %pear_package_setup(a:d:n:zDc:) \
-%define srcdir %{-n*}%{!-n:%{_pearname}-%{version}} \
+%define srcdir %{-n*}%{!-n:%{?_pearname}%{!?_pearname:%{pearname}}-%{version}} \
 %define builddir %{_builddir}/%{srcdir} \
 %setup -q -c -T %{-D:-D} -n %{srcdir} \
 %{-z:%{__tar} zxf %{S:0}; %{-a:%{__tar} zxf %{S:%{-a*}}}} \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.579&r2=1.580&f=u