SPECS (rpm-4_4_9): rpm.spec - AC-branch merge

[glen]

Author: glen                         Date: Sat Feb  9 14:55:08 2008 GMT
Module: SPECS                         Tag: rpm-4_4_9
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42 -> 1.837.2.43) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42 SPECS/rpm.spec:1.837.2.43
--- SPECS/rpm.spec:1.837.2.42	Wed Feb  6 18:35:11 2008
+++ SPECS/rpm.spec	Sat Feb  9 15:55:02 2008
@@ -37,7 +37,7 @@
 Summary(uk.UTF-8):	ĐœĐľĐ˝ĐľĐ´ĐśĐľŃ€ пакотів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	30
+Release:	33
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -135,10 +135,6 @@
 BuildRequires:	bzip2-devel >= 1.0.2-17
 BuildRequires:	db-devel >= %{reqdb_ver}
 BuildRequires:	elfutils-devel >= 0.108
-%ifnarch sparc64
-# -fPIE/-pie
-BuildRequires:	gcc >= 5:3.4
-%endif
 BuildRequires:	gettext-devel >= 0.11.4-2
 %{?with_system_libmagic:BuildRequires:	libmagic-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
@@ -151,8 +147,8 @@
 %endif
 BuildRequires:	patch >= 2.2
 BuildRequires:	popt-devel >= %{reqpopt_ver}
-%{?with_python:BuildRequires:	python-devel >= 1:2.5}
-BuildRequires:	python-modules >= 1:2.5
+%{?with_python:BuildRequires:	python-devel >= 1:2.3}
+BuildRequires:	python-modules >= 1:2.3
 BuildRequires:	rpm-perlprov
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	zlib-devel
@@ -472,7 +468,11 @@
 Requires:	file >= 4.17
 Requires:	fileutils
 Requires:	findutils
-Requires:	gcc >= 5:3.4
+%ifarch athlon
+Requires:	gcc >= 3.0.3
+%else
+Requires:	gcc
+%endif
 Requires:	glibc-devel
 Requires:	grep
 Requires:	gzip
@@ -813,6 +813,10 @@
 echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
+%ifarch alpha
+echo "alpha-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+
 # x86 things
 %ifarch athlon %{x8664}
 echo "athlon-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
@@ -845,11 +849,6 @@
 # noarch
 echo "noarch-[^-]*-.*" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 
-%ifarch %{ppc}
-#sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \
-#	-i $RPM_BUILD_ROOT%{_rpmlibdir}/ppc74[05]0-linux/macros
-%endif
-
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides*
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl
@@ -1259,6 +1258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.43  2008-02-09 14:55:02  glen
+- AC-branch merge
+
 Revision 1.837.2.42  2008-02-06 17:35:11  glen
 - change R: filesystem-debuginfo to conflicts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42&r2=1.837.2.43&f=u