From: Tomasz Pala <gotar@pld-linux.org>
Date: Thu, 3 Jan 2002 23:08:14 +0000 (+0000)
Subject: - added Requires: fileutils for rpm-build subpackage.
X-Git-Tag: rpm-4_0_2-47~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=6d82b332839f7928ef0b20f72f6298b4743853ab

- added Requires: fileutils for rpm-build subpackage.

Changed files:
    rpm.spec -> 1.268
---

diff --git a/rpm.spec b/rpm.spec
index b258d55..38dd5e1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -76,14 +76,14 @@ BuildRequires:	zlib-static >= 1.1.4
 Obsoletes:	rpm-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	rpm-libs
-%define __find_provides %{SOURCE4}
-%define _binary_payload w9.gzdio
+Conflicts:	glibc < 2.2
+
 %define		__find_provides	%{SOURCE4}
-%define py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
-%define py_prefix      %(echo `python -c "import sys; print sys.prefix"`)
-%define py_libdir      %{py_prefix}/lib/python%{py_ver}
-%define py_sitedir     %{py_libdir}/site-packages
-%define py_dyndir      %{py_libdir}/lib-dynload
+%define		_binary_payload	w9.gzdio
+
+%define		py_ver		%(echo `python -c "import sys; print sys.version[:3]"`)
+%define		py_prefix	%(echo `python -c "import sys; print sys.prefix"`)
+%define		py_libdir	%{py_prefix}/lib/python%{py_ver}
 %define		py_dyndir	%{py_libdir}/lib-dynload
 %define		pyrequires_eq() Requires:	%1 >= %py_ver %1 < %(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`)
 
@@ -253,6 +253,7 @@ Group:		Applications/File
 Requires:	/bin/id
 Requires:	awk
 Requires:	binutils
+Requires:	diffutils
 Requires:	file >= 3.31
 Requires:	gcc >= 3.0.3
 Requires:	gcc