- fixed debug CFLAGS/CXXFLAGS/FFLAGS in macros.pld

- rpm-build Requires: libtool - many libraries use it
- release 2

Changed files:
    rpm.macros -> 1.43
    rpm.spec -> 1.178

diff --git a/rpm.macros b/rpm.macros
index a55a3960d109753c2da4726249acbd41b6632d3c..b97eeda130a4e21b0d6d9951b7972c2478744c1f 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -2,9 +2,9 @@
 %configure { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
  LDFLAGS="${LDFLAGS:-%{!?debug: -s}}" ; export LDFLAGS ; \
- CFLAGS="${CFLAGS:-%optflags}%{?debug: -g -O0}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}%{?debug: -g -O0}" ; export CXXFLAGS ; \
- FFLAGS="${FFLAGS:-%optflags}%{?debug: -g -O0}" ; export FFLAGS ; \
+ CFLAGS="${CFLAGS:-%{!?debug:%optflags}%{?debug: -g -O0}}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%{!?debug:%optflags}%{?debug: -g -O0}}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%{!?debug:%optflags}%{?debug: -g -O0}}" ; export FFLAGS ; \
  ./configure %{_target_platform} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \

diff --git a/rpm.spec b/rpm.spec
index d4f2f62a567f2edb1b1719755e25f208737c3573..0222b28363a436022b08fdcdf7da9b9a2df7d2b1 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary:        Red Hat (and now also PLD) Package Manager
 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       4.0.2
-Release:       1
+Release:       2
 Group:         Base
 Group(de):     Gründsätzlich
 Group(pl):     Podstawowe
@@ -172,6 +172,7 @@ Requires:   binutils
 Requires:      gcc >= 3.0.3
 Requires:      gcc
 Requires:      diffutils
+Requires:      libtool
 Requires:      tar
 Requires:      textutils