1 diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
2 --- rpm-4.4.7.org/macros.in 2006-09-24 21:29:28.000000000 +0200
3 +++ rpm-4.4.7/macros.in 2007-01-24 11:20:36.000000000 +0100
8 -%_defaultdocdir %{_usr}/doc
9 +%_defaultdocdir %{_usr}/share/doc
11 # The path to the gzip executable (legacy, use %{__gzip} instead).
14 %_srcrpmdir %{_topdir}/SRPMS
16 # Directory where temporaray files can be created.
17 -%_tmppath %{_var}/tmp
18 +%_tmppath %(echo "${TMPDIR:-/tmp}")
21 # Path to top of build area.
22 -%_topdir %{_usrsrc}/rpm
23 +%_topdir %(echo $HOME)/rpm
25 # The path to the unzip executable (legacy, use %{__unzip} instead).
28 # Configurable build root path, same as BuildRoot: in a specfile.
29 # (Note: the configured macro value will override the spec file value).
31 -%buildroot %{_tmppath}/%{name}-root
32 +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
34 # The sub-directory (relative to %{_builddir}) where sources are compiled.
35 # This macro is set after processing %setup, either explicitly from the
37 # "w9.gzdio" gzip level 9 (default).
38 # "w9.bzdio" bzip2 level 9.
40 -#%_source_payload w9.gzdio
41 -#%_binary_payload w9.gzdio
42 +%_source_payload w9.gzdio
43 +%_binary_payload w9.lzdio
45 # Archive formats to use for source/binary package payloads.
46 # "cpio" cpio archive (default)
50 # Path to magic file used for file classification.
51 -%_rpmfc_magic_path %{_usr}/lib/rpm/magic
52 +%_rpmfc_magic_path /usr/share/file/magic
54 #==============================================================================
55 # ---- Database configuration macros.
57 export RPM_BUILD_ROOT}\
58 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
61 + unset PERL_MM_OPT || :\
67 %{verbose:set -x}%{!verbose:exec > /dev/null}\
70 %_includedir %{_prefix}/include
71 %_oldincludedir /usr/include
72 %_infodir %{_prefix}/info
73 -%_mandir %{_prefix}/man
74 +%_mandir %{_prefix}/share/man
76 #==============================================================================
77 # ---- config.guess platform macros.
78 @@ -1361,7 +1362,25 @@
79 # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
80 #%__executable_provides @RPMCONFIGDIR@/executabledeps.sh --provides
81 #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires
82 -%__scriptlet_requires /bin/bash --rpm-requires
83 +#%__scriptlet_requires /bin/bash --rpm-requires
86 +%_enable_debug_packages 1
88 +#-----------------------------------------------------------------
89 +# CFLAGS and LDFLAGS used to build
91 +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
92 +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
94 +%debugcflags -O0 -g -Wall
95 +%optldflags -Wl,--as-needed
97 +# Warning: those macros are overwritten by macros.build,
98 +# left here for compatibility
99 +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
100 +%rpmcxxflags %{rpmcflags}
101 +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
105 --- rpm/configure.ac.org 2007-02-08 09:16:46.554623000 +0100
106 +++ rpm/configure.ac 2007-02-08 09:18:16.386623000 +0100
107 @@ -1368,7 +1368,7 @@
108 [Full path to rpm system configuration directory (usually /etc/rpm)])
109 AC_SUBST(SYSCONFIGDIR)
111 -MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
112 +MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/macros.build:${RPMCONFIGDIR}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
113 AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
114 [Colon separated paths of macro files to read.])