- branch specific macros separated

Changed files:
    rpm.macros -> 1.256
    rpm.spec -> 1.710

diff --git a/rpm.macros b/rpm.macros
index 232ab6e71b2d5ba4f3d365c791c58aa8049b2820..62882c9cbd6d999b3c7b5a6539effe072ec5abfe 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -2,19 +2,6 @@
 
 # other macros
 %epoch         0
-%_enable_debug_packages 1
-
-%_topdir         %(echo $HOME)/rpm
-#-----------------------------------------------------------------
-# CFLAGS and LDFLAGS used to build
-
-%debuginfocflags       %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
-
-%debugcflags   -O0 -g -Wall
-%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
-%rpmcxxflags   %{rpmcflags}
-%rpmldflags    %{nil}
-# %rpmldflags  -Wl,--as-needed
 
 # kernel compiler
 %kgcc          gcc

diff --git a/rpm.spec b/rpm.spec
index 108cc7fc6cc3d99a2ddd2c6022643b73f3d71791..1a669fce05ec0e1c18a4b9528a637fcb89a02ebe 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@ Summary(uk):  
 Name:          rpm
 %define        sover   4.4
 Version:       4.4.2
-Release:       24.1
+Release:       24.2
 License:       GPL
 Group:         Base
 Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -104,6 +104,7 @@ Patch46:    %{name}-mono.patch
 Patch47:       %{name}-posttrans.patch
 Patch48:       %{name}-requireseq.patch
 Patch49:       %{name}-p4.patch
+Patch50:       %{name}-macros.patch
 URL:           http://wraptastic.org/
 Icon:          rpm.gif
 BuildRequires: autoconf >= 2.52
@@ -675,6 +676,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p1
 %patch0 -p1
 %patch3 -p1