- rpm.macros: don't add -s to LDFLAGS in %%configure if LDFLAGS!=""

  (needed for not stripping ld.so during build)
- patch to (buggy) installplatform script
- removed brp-strip patch (it does nothing - ld.so is shared object, which
  brp-strip doesn't strip)
- db1 buildreq is bcond_off_static-dependent
- release 11

Changed files:
    rpm.spec -> 1.159

diff --git a/rpm.spec b/rpm.spec
index bcc2d40ca03748967b4a034e9e31f10b7fbaf235..7113b973709d9da0ac58d3bba6b5093d221f8fa1 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:       4.0
-Release:       10
+Release:       11
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -32,7 +32,7 @@ Patch13:      %{name}-getrpmlibprov.patch
 Patch14:        %{name}-rpmlibprov-order.patch
 Patch15:       %{name}-bash2.patch
 Patch16:       %{name}-perl-req-perlfile.patch
-Patch17:       %{name}-brp-strip.patch
+Patch17:       %{name}-installplatform.patch
 Patch18:       %{name}-find-lang.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
@@ -48,6 +48,7 @@ BuildRequires:        automake
 BuildRequires: autoconf >= 2.13-8
 %if %{!?bcond_off_static:1}%{?bcond_off_static:0}
 BuildRequires: zlib-devel >= 1.1.4
+# Require static library only for static build
 BuildRequires: db3-static >= 3.1.17
 BuildRequires: bzip2-static >= 1.0.1
 BuildRequires: gdbm-static