- release 25,

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index a8032d8fd594e5ca647d87e01aefcb3f152c439a..f286ccc8a7c1d2a4f178f2fa66650d42c5cde394 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary:        Red Hat & PLD Package Manager
 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       3.0.3
-Release:       23
+Release:       25
 Group:         Base
 Group(pl):     Podstawowe
 Copyright:     GPL
@@ -19,6 +19,7 @@ Patch5:               rpm-rpmpopt.patch
 Patch6:                rpm-findlangs.patch
 Patch7:                rpm-perl-macros.patch
 Patch8:                rpm-nodeps.patch
+Patch9:                rpm-find-provides.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires: bzip2-static
@@ -31,6 +32,7 @@ BuildRequires:        autoconf >= 2.13-8
 BuildRequires: gettext-devel
 Requires:      glibc >= 2.1
 BuildRoot:     /tmp/%{name}-%{version}-root
+Conflicts:     /usr/bin/id
 Obsoletes:     rpm-libs
 %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, '.')"`)
 RPM is a powerful package manager, which can be used to build, install, 
@@ -122,6 +124,7 @@ construir pacotes usando o RPM.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 %patch31 -p1
 install %{SOURCE3} macros.pld.in
 install %{SOURCE13} macros.python.in