1 diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
2 --- rpm-4.4.7.org/macros.in 2007-01-06 18:28:22.094067000 +0100
3 +++ rpm-4.4.7/macros.in 2007-01-06 18:37:05.250762500 +0100
5 %_srcrpmdir %{_topdir}/SRPMS
7 # Directory where temporaray files can be created.
9 +%_tmppath %(echo "${TMPDIR:-/tmp}")
12 # Path to top of build area.
13 -%_topdir %{_usrsrc}/rpm
14 +%_topdir %(echo $HOME)/rpm
16 # The path to the unzip executable (legacy, use %{__unzip} instead).
19 # Configurable build root path, same as BuildRoot: in a specfile.
20 # (Note: the configured macro value will override the spec file value).
22 -%buildroot %{_tmppath}/%{name}-root
23 +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
25 # The sub-directory (relative to %{_builddir}) where sources are compiled.
26 # This macro is set after processing %setup, either explicitly from the
28 # "w9.gzdio" gzip level 9 (default).
29 # "w9.bzdio" bzip2 level 9.
31 -#%_source_payload w9.gzdio
32 -#%_binary_payload w9.gzdio
33 +%_source_payload w9.gzdio
34 +%_binary_payload w9.lzdio
36 # Archive formats to use for source/binary package payloads.
37 # "cpio" cpio archive (default)
41 # Path to magic file used for file classification.
42 -%_rpmfc_magic_path %{_usr}/lib/rpm/magic
43 +%_rpmfc_magic_path /usr/share/file/magic
45 #==============================================================================
46 # ---- Database configuration macros.
48 export RPM_BUILD_ROOT}\
49 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
52 + unset PERL_MM_OPT || :\
58 %{verbose:set -x}%{!verbose:exec > /dev/null}\
60 @@ -1371,5 +1372,23 @@
61 #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires
62 %__scriptlet_requires /bin/bash --rpm-requires
65 +%_enable_debug_packages 1
67 +#-----------------------------------------------------------------
68 +# CFLAGS and LDFLAGS used to build
70 +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
71 +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
73 +%debugcflags -O0 -g -Wall
74 +%optldflags -Wl,--as-needed
76 +# Warning: those macros are overwritten by macros.build,
77 +# left here for compatibility
78 +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
79 +%rpmcxxflags %{rpmcflags}
80 +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}