1 diff -urN rpm.org/macros.in rpm/macros.in
2 --- rpm.org/macros.in 2007-10-02 20:46:56.430390000 +0200
3 +++ rpm/macros.in 2007-10-02 20:49:01.480941544 +0200
8 -%_defaultdocdir %{_usr}/doc
9 +%_defaultdocdir %{_usr}/share/doc
11 # The path to the pgp executable (legacy, use %{__pgp} instead).
14 # The directory where newly built source packages will be written.
15 %_srcrpmdir %{_topdir}/SRPMS
17 -# Directory where temporaray files can be created.
18 -%_tmppath %{_var}/tmp
19 +# Directory where temporary files can be created.
20 +%_tmppath %(echo "${TMPDIR:-/tmp}")
23 # Path to top of build area.
24 -%_topdir @PKGSRCDIR_MACRO@
25 +%_topdir %(echo $HOME)/rpm
27 #==============================================================================
28 # ---- Optional rpmrc macros.
30 # Configurable build root path, same as BuildRoot: in a specfile.
31 # (Note: the configured macro value will override the spec file value).
33 -%buildroot %{_tmppath}/%{name}-root
34 +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
36 # The sub-directory (relative to %{_builddir}) where sources are compiled.
37 # This macro is set after processing %setup, either explicitly from the
39 # "w9.bzdio" bzip2 level 9.
40 # "w9.lzdio" lzma level 9.
42 -#%_source_payload w9.gzdio
43 -#%_binary_payload w9.gzdio
44 +%_source_payload w9.gzdio
45 +%_binary_payload w9.lzdio
47 # Archive formats to use for source/binary package payloads.
48 # "cpio" cpio archive (default)
52 # Path to magic file used for file classification.
53 -%_rpmfc_magic_path %{_rpmhome}/magic
54 +%_rpmfc_magic_path /usr/share/file/magic
56 #==============================================================================
57 # ---- Database configuration macros.
58 @@ -1224,17 +1224,17 @@
59 %_exec_prefix %{_prefix}
60 %_bindir %{_exec_prefix}/bin
61 %_sbindir %{_exec_prefix}/sbin
62 -%_libexecdir %{_exec_prefix}/libexec
63 +%_libexecdir %{_exec_prefix}/lib
64 %_datadir %{_prefix}/share
65 -%_sysconfdir %{_prefix}/etc
66 -%_sharedstatedir %{_prefix}/com
67 -%_localstatedir %{_prefix}/var
69 +%_sharedstatedir /var/lib
72 %_libdir %{_exec_prefix}/%{_lib}
73 %_includedir %{_prefix}/include
74 %_oldincludedir /usr/include
75 -%_infodir %{_prefix}/info
76 -%_mandir %{_prefix}/man
77 +%_infodir %{_prefix}/share/info
78 +%_mandir %{_prefix}/share/man
79 %_localedir %{_datadir}/locale
81 #==============================================================================
82 @@ -1535,7 +1535,33 @@
83 # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
84 #%__executable_provides %{_rpmhome}/executabledeps.sh --provides
85 #%__executable_requires %{_rpmhome}/executabledeps.sh --requires
86 -%__scriptlet_requires /bin/bash --rpm-requires
87 +#%__scriptlet_requires /bin/bash --rpm-requires
90 +%_enable_debug_packages 1
92 +# provides don't obsolete
95 +#-----------------------------------------------------------------
96 +# CFLAGS and LDFLAGS used to build
98 +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
99 +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
101 +%debugcflags -O0 -g -Wall
102 +%optldflags -Wl,--as-needed
104 +# Warning: those macros are overwritten by macros.build,
105 +# left here for compatibility
106 +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
107 +%rpmcxxflags %{rpmcflags}
108 +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
111 +%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
112 +%x8664 x86_64 amd64 ia32e
113 +%ppc ppc ppc7400 ppc7450