From cae41ac74c4ad12bccfa3f76fe3903cb8ba24c91 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 16 Mar 2001 18:04:50 +0000 Subject: [PATCH] - 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 --- rpm.macros | 6 +++--- rpm.spec | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rpm.macros b/rpm.macros index a55a396..b97eeda 100644 --- 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 d4f2f62..0222b28 100644 --- 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 -- 2.43.0