]>
Commit | Line | Data |
---|---|---|
eb4e76ca AM |
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 | |
4 | @@ -213,7 +213,7 @@ | |
4d016095 AM |
5 | %endif\ |
6 | %{nil} | |
7 | ||
8 | -%_defaultdocdir %{_usr}/doc | |
9 | +%_defaultdocdir %{_usr}/share/doc | |
10 | ||
c9b276b0 JB |
11 | # The path to the pgp executable (legacy, use %{__pgp} instead). |
12 | %_pgpbin %{__pgp} | |
eb4e76ca | 13 | @@ -242,12 +242,12 @@ |
c9b276b0 | 14 | # The directory where newly built source packages will be written. |
5bfda13a AM |
15 | %_srcrpmdir %{_topdir}/SRPMS |
16 | ||
c9b276b0 | 17 | -# Directory where temporaray files can be created. |
5bfda13a | 18 | -%_tmppath %{_var}/tmp |
c9b276b0 | 19 | +# Directory where temporary files can be created. |
5bfda13a | 20 | +%_tmppath %(echo "${TMPDIR:-/tmp}") |
c9b276b0 | 21 | %tmpdir %{_tmppath} |
e493253e ER |
22 | |
23 | # Path to top of build area. | |
fee89ffa | 24 | -%_topdir @PKGSRCDIR_MACRO@ |
dc6aae45 | 25 | +%_topdir %(echo $HOME)/rpm |
e493253e | 26 | |
c9b276b0 JB |
27 | #============================================================================== |
28 | # ---- Optional rpmrc macros. | |
eb4e76ca | 29 | @@ -257,7 +257,7 @@ |
5bfda13a AM |
30 | # Configurable build root path, same as BuildRoot: in a specfile. |
31 | # (Note: the configured macro value will override the spec file value). | |
32 | # | |
33 | -%buildroot %{_tmppath}/%{name}-root | |
34 | +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n) | |
35 | ||
36 | # The sub-directory (relative to %{_builddir}) where sources are compiled. | |
37 | # This macro is set after processing %setup, either explicitly from the | |
eb4e76ca | 38 | @@ -356,8 +356,8 @@ |
3f2f32d6 | 39 | # "w9.bzdio" bzip2 level 9. |
c9b276b0 | 40 | # "w9.lzdio" lzma level 9. |
3f2f32d6 ER |
41 | # |
42 | -#%_source_payload w9.gzdio | |
43 | -#%_binary_payload w9.gzdio | |
44 | +%_source_payload w9.gzdio | |
45 | +%_binary_payload w9.lzdio | |
46 | ||
47 | # Archive formats to use for source/binary package payloads. | |
48 | # "cpio" cpio archive (default) | |
eb4e76ca | 49 | @@ -522,7 +522,7 @@ |
e72fb97a AM |
50 | |
51 | # | |
52 | # Path to magic file used for file classification. | |
fee89ffa | 53 | -%_rpmfc_magic_path %{_rpmhome}/magic |
e72fb97a AM |
54 | +%_rpmfc_magic_path /usr/share/file/magic |
55 | ||
56 | #============================================================================== | |
57 | # ---- Database configuration macros. | |
eb4e76ca | 58 | @@ -1224,17 +1224,17 @@ |
c9b276b0 JB |
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 | |
68 | +%_sysconfdir /etc | |
69 | +%_sharedstatedir /var/lib | |
70 | +%_localstatedir /var | |
71 | %_lib lib | |
72 | %_libdir %{_exec_prefix}/%{_lib} | |
3bf6878c AM |
73 | %_includedir %{_prefix}/include |
74 | %_oldincludedir /usr/include | |
c9b276b0 | 75 | -%_infodir %{_prefix}/info |
3bf6878c | 76 | -%_mandir %{_prefix}/man |
c9b276b0 | 77 | +%_infodir %{_prefix}/share/info |
3bf6878c | 78 | +%_mandir %{_prefix}/share/man |
c9b276b0 | 79 | %_localedir %{_datadir}/locale |
3bf6878c AM |
80 | |
81 | #============================================================================== | |
eb4e76ca | 82 | @@ -1535,7 +1535,33 @@ |
fee89ffa AM |
83 | # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. |
84 | #%__executable_provides %{_rpmhome}/executabledeps.sh --provides | |
85 | #%__executable_requires %{_rpmhome}/executabledeps.sh --requires | |
d488200a AM |
86 | -%__scriptlet_requires /bin/bash --rpm-requires |
87 | +#%__scriptlet_requires /bin/bash --rpm-requires | |
c9b276b0 | 88 | |
e493253e ER |
89 | +# PLD rpm macros |
90 | +%_enable_debug_packages 1 | |
91 | + | |
9ddee74b AM |
92 | +# provides don't obsolete |
93 | +%_upgrade_tag name | |
94 | + | |
e493253e ER |
95 | +#----------------------------------------------------------------- |
96 | +# CFLAGS and LDFLAGS used to build | |
97 | + | |
5dda5fa7 PS |
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. | |
e493253e ER |
100 | + |
101 | +%debugcflags -O0 -g -Wall | |
5b60995d | 102 | +%optldflags -Wl,--as-needed |
103 | + | |
104 | +# Warning: those macros are overwritten by macros.build, | |
105 | +# left here for compatibility | |
e493253e ER |
106 | +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} |
107 | +%rpmcxxflags %{rpmcflags} | |
4126bfd3 | 108 | +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed} |
eb4e76ca AM |
109 | + |
110 | +# arch macros | |
111 | +%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon | |
112 | +%x8664 x86_64 amd64 ia32e | |
113 | +%ppc ppc ppc7400 ppc7450 | |
c9b276b0 | 114 | + |
e493253e ER |
115 | # \endverbatim |
116 | #*/ |