]>
Commit | Line | Data |
---|---|---|
5bfda13a | 1 | diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in |
4d016095 AM |
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 | |
4 | @@ -181,7 +181,7 @@ | |
5 | %endif\ | |
6 | %{nil} | |
7 | ||
8 | -%_defaultdocdir %{_usr}/doc | |
9 | +%_defaultdocdir %{_usr}/share/doc | |
10 | ||
11 | # The path to the gzip executable (legacy, use %{__gzip} instead). | |
12 | %_gzipbin %{__gzip} | |
13 | @@ -212,10 +212,11 @@ | |
5bfda13a AM |
14 | %_srcrpmdir %{_topdir}/SRPMS |
15 | ||
16 | # Directory where temporaray files can be created. | |
17 | -%_tmppath %{_var}/tmp | |
18 | +%_tmppath %(echo "${TMPDIR:-/tmp}") | |
19 | +%tmpdir %{_tmppath} | |
e493253e ER |
20 | |
21 | # Path to top of build area. | |
dc6aae45 JB |
22 | -%_topdir %{_usrsrc}/rpm |
23 | +%_topdir %(echo $HOME)/rpm | |
e493253e ER |
24 | |
25 | # The path to the unzip executable (legacy, use %{__unzip} instead). | |
26 | %_unzipbin %{__unzip} | |
4d016095 | 27 | @@ -228,7 +229,7 @@ |
5bfda13a AM |
28 | # Configurable build root path, same as BuildRoot: in a specfile. |
29 | # (Note: the configured macro value will override the spec file value). | |
30 | # | |
31 | -%buildroot %{_tmppath}/%{name}-root | |
32 | +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n) | |
33 | ||
34 | # The sub-directory (relative to %{_builddir}) where sources are compiled. | |
35 | # This macro is set after processing %setup, either explicitly from the | |
4d016095 | 36 | @@ -326,8 +327,8 @@ |
3f2f32d6 ER |
37 | # "w9.gzdio" gzip level 9 (default). |
38 | # "w9.bzdio" bzip2 level 9. | |
39 | # | |
40 | -#%_source_payload w9.gzdio | |
41 | -#%_binary_payload w9.gzdio | |
42 | +%_source_payload w9.gzdio | |
43 | +%_binary_payload w9.lzdio | |
44 | ||
45 | # Archive formats to use for source/binary package payloads. | |
46 | # "cpio" cpio archive (default) | |
4d016095 | 47 | @@ -473,7 +474,7 @@ |
e72fb97a AM |
48 | |
49 | # | |
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 | |
53 | ||
54 | #============================================================================== | |
55 | # ---- Database configuration macros. | |
4d016095 | 56 | @@ -921,10 +922,10 @@ |
a3b822b2 JB |
57 | export RPM_BUILD_ROOT}\ |
58 | %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ | |
59 | export CLASSPATH}\ | |
60 | - unset PERL_MM_OPT\ | |
61 | + unset PERL_MM_OPT || :\ | |
62 | LANG=C\ | |
63 | export LANG\ | |
64 | - unset DISPLAY\ | |
65 | + unset DISPLAY || :\ | |
66 | \ | |
67 | %{verbose:set -x}%{!verbose:exec > /dev/null}\ | |
68 | umask 022\ | |
4d016095 | 69 | @@ -1083,7 +1084,7 @@ |
3bf6878c AM |
70 | %_includedir %{_prefix}/include |
71 | %_oldincludedir /usr/include | |
72 | %_infodir %{_prefix}/info | |
73 | -%_mandir %{_prefix}/man | |
74 | +%_mandir %{_prefix}/share/man | |
75 | ||
76 | #============================================================================== | |
77 | # ---- config.guess platform macros. | |
4d016095 | 78 | @@ -1361,7 +1362,25 @@ |
d488200a AM |
79 | # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}. |
80 | #%__executable_provides @RPMCONFIGDIR@/executabledeps.sh --provides | |
dc6aae45 | 81 | #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires |
d488200a AM |
82 | -%__scriptlet_requires /bin/bash --rpm-requires |
83 | +#%__scriptlet_requires /bin/bash --rpm-requires | |
84 | + | |
e493253e ER |
85 | +# PLD rpm macros |
86 | +%_enable_debug_packages 1 | |
87 | + | |
88 | +#----------------------------------------------------------------- | |
89 | +# CFLAGS and LDFLAGS used to build | |
90 | + | |
5dda5fa7 PS |
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. | |
e493253e ER |
93 | + |
94 | +%debugcflags -O0 -g -Wall | |
5b60995d | 95 | +%optldflags -Wl,--as-needed |
96 | + | |
97 | +# Warning: those macros are overwritten by macros.build, | |
98 | +# left here for compatibility | |
e493253e ER |
99 | +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} |
100 | +%rpmcxxflags %{rpmcflags} | |
4126bfd3 | 101 | +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed} |
d488200a | 102 | |
e493253e ER |
103 | # \endverbatim |
104 | #*/ | |
f587ec65 AM |
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) | |
110 | ||
111 | -MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros" | |
f590e9a7 | 112 | +MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/macros.build:${RPMCONFIGDIR}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros" |
f587ec65 AM |
113 | AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES", |
114 | [Colon separated paths of macro files to read.]) | |
115 | AC_SUBST(MACROFILES) |