- move new R:binutils, to -build subpkg.

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index d8de291132b929f2141bf48c6a7e4f7b1b590121..17875e759e4857814829b729a2c07add9aa65b70 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@ Summary(ru):  
 Summary(uk):   íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM
 Name:          rpm
 Version:       4.4.6
-Release:       1.11
+Release:       1.14
 License:       GPL
 Group:         Base
 Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -111,6 +111,7 @@ Patch54:    %{name}-lzma2.patch
 Patch55:       %{name}-truncate-cvslog.patch
 Patch56:       %{name}-skip-backups.patch
 Patch57:       %{name}-as_needed-fix.patch
+Patch58:       %{name}-bzip2_fallback.patch
 URL:           http://wraptastic.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
@@ -262,6 +263,7 @@ Requires:   popt >= %{reqpopt_ver}
 Obsoletes:     rpm-libs
 # avoid SEGV caused by mixed db versions
 Conflicts:     poldek < 0.18.1-16
+Suggests:      lzma
 
 %description lib
 RPMs library.
@@ -438,7 +440,8 @@ Requires:   %{name}-build-macros >= 1.314
 Requires:      %{name}-utils = %{version}-%{release}
 Requires:      /bin/id
 Requires:      awk
-Requires:      binutils
+# we need fixed binutils for -feliminate-dwarf2-dups
+Requires:      binutils >= 3:2.17.50.0.3-2
 Requires:      bzip2
 Requires:      chrpath >= 0.10-4
 Requires:      cpio
@@ -689,6 +692,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -747,7 +751,7 @@ CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
        %{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \
        --enable-shared \
        --enable-static \
-       %{?with_apidocs:--with-apidocs} \
+       %{!?with_apidocs:--without-apidocs} \
        %{?with_python:--with-python=2.5} \
        %{!?with_python:--without-python} \
        %{!?with_selinux:--without-selinux} \