SPECS (AC-branch): rpm.spec - updated pl for -pearprov, use x8664 ...

[qboosh]

Author: qboosh                       Date: Fri Oct  7 09:12:00 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated pl for -pearprov, use x8664 macro, sync cosmetics with HEAD

---- Files affected:
SPECS:
   rpm.spec (1.555.2.126 -> 1.555.2.127) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.126 SPECS/rpm.spec:1.555.2.127
--- SPECS/rpm.spec:1.555.2.126	Thu Oct  6 19:26:28 2005
+++ SPECS/rpm.spec	Fri Oct  7 11:11:55 2005
@@ -130,7 +130,7 @@
 BuildRequires:	python-modules >= 1:2.3
 BuildRequires:	readline-devel
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpm-pythonprov
+%{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	zlib-devel
 %if %{with static}
 # Require static library only for static build
@@ -541,13 +541,16 @@
 Additional utilities for checking php pear provides/requires in rpm
 packages.
 
-This package provides rpm macros and dependencies to help building PEAR
-packages.
+This package provides rpm macros and dependencies to help building
+PEAR packages.
 
 %description php-pearprov -l pl
 Dodatkowe narzędzia do sprawdzenia zależności skryptów php pear w
 pakietach rpm.
 
+Ten pakiet dostarcza makra rpm-a i zależności pomagające przy
+budowaniu pakietów PEAR-a.
+
 %package -n python-rpm
 Summary:	Python interface to RPM library
 Summary(pl):	Pythonowy interfejs do biblioteki RPM-a
@@ -1036,10 +1039,6 @@
 %ifarch alpha
 %{_rpmlibdir}/alpha*
 %endif
-%ifarch amd64
-%{_rpmlibdir}/amd64*
-%{_rpmlibdir}/x86_64*
-%endif
 %ifarch ia64
 %{_rpmlibdir}/ia64*
 %endif
@@ -1052,6 +1051,10 @@
 %ifarch sparc sparc64
 %{_rpmlibdir}/sparc*
 %endif
+%ifarch %{x8664}
+%{_rpmlibdir}/amd64*
+%{_rpmlibdir}/x86_64*
+%endif
 # must be here for "Requires: rpm-*prov" to work
 %{_rpmlibdir}/macros.mono
 %{_rpmlibdir}/macros.perl
@@ -1121,6 +1124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.127  2005/10/07 09:11:55  qboosh
+- updated pl for -pearprov, use x8664 macro, sync cosmetics with HEAD
+
 Revision 1.555.2.126  2005/10/06 17:26:28  paszczus
 - reverted
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.126&r2=1.555.2.127&f=u