]>
Commit | Line | Data |
---|---|---|
d7636944 ER |
1 | --- rpm-4.4.8/macros.in 2007-04-08 20:36:08.925632417 +0200 |
2 | +++ rpm-4.4.9/macros.in 2008-01-25 02:16:46.248708080 +0200 | |
c9b276b0 | 3 | @@ -206,7 +206,7 @@ |
4d016095 AM |
4 | %endif\ |
5 | %{nil} | |
6 | ||
7 | -%_defaultdocdir %{_usr}/doc | |
8 | +%_defaultdocdir %{_usr}/share/doc | |
9 | ||
c9b276b0 JB |
10 | # The path to the pgp executable (legacy, use %{__pgp} instead). |
11 | %_pgpbin %{__pgp} | |
12 | @@ -233,12 +233,12 @@ | |
13 | # The directory where newly built source packages will be written. | |
5bfda13a AM |
14 | %_srcrpmdir %{_topdir}/SRPMS |
15 | ||
c9b276b0 | 16 | -# Directory where temporaray files can be created. |
5bfda13a | 17 | -%_tmppath %{_var}/tmp |
c9b276b0 | 18 | +# Directory where temporary files can be created. |
5bfda13a | 19 | +%_tmppath %(echo "${TMPDIR:-/tmp}") |
c9b276b0 | 20 | %tmpdir %{_tmppath} |
e493253e ER |
21 | |
22 | # Path to top of build area. | |
dc6aae45 JB |
23 | -%_topdir %{_usrsrc}/rpm |
24 | +%_topdir %(echo $HOME)/rpm | |
e493253e | 25 | |
c9b276b0 JB |
26 | #============================================================================== |
27 | # ---- Optional rpmrc macros. | |
28 | @@ -248,7 +248,7 @@ | |
5bfda13a AM |
29 | # Configurable build root path, same as BuildRoot: in a specfile. |
30 | # (Note: the configured macro value will override the spec file value). | |
31 | # | |
32 | -%buildroot %{_tmppath}/%{name}-root | |
33 | +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n) | |
34 | ||
35 | # The sub-directory (relative to %{_builddir}) where sources are compiled. | |
36 | # This macro is set after processing %setup, either explicitly from the | |
c9b276b0 | 37 | @@ -347,8 +347,8 @@ |
3f2f32d6 | 38 | # "w9.bzdio" bzip2 level 9. |
c9b276b0 | 39 | # "w9.lzdio" lzma level 9. |
3f2f32d6 ER |
40 | # |
41 | -#%_source_payload w9.gzdio | |
42 | -#%_binary_payload w9.gzdio | |
43 | +%_source_payload w9.gzdio | |
44 | +%_binary_payload w9.lzdio | |
45 | ||
46 | # Archive formats to use for source/binary package payloads. | |
47 | # "cpio" cpio archive (default) | |
c9b276b0 | 48 | @@ -498,7 +498,7 @@ |
e72fb97a AM |
49 | |
50 | # | |
51 | # Path to magic file used for file classification. | |
52 | -%_rpmfc_magic_path %{_usr}/lib/rpm/magic | |
53 | +%_rpmfc_magic_path /usr/share/file/magic | |
54 | ||
55 | #============================================================================== | |
56 | # ---- Database configuration macros. | |
d7636944 ER |
57 | @@ -991,9 +991,12 @@ |
58 | %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ | |
59 | export CLASSPATH}\ | |
60 | unset PERL_MM_OPT || :\ | |
61 | - LANG=C\ | |
62 | - export LANG\ | |
63 | - unset DISPLAY || :\ | |
64 | + export LC_ALL=C\ | |
65 | + export LANG=C\ | |
66 | + unset LINGUAS ||:\ | |
67 | + unset LANGUAGE ||:\ | |
68 | + unset LC_MESSAGES ||:\ | |
69 | + unset DISPLAY ||:\ | |
70 | \ | |
71 | %{verbose:set -x}%{!verbose:exec > /dev/null}\ | |
72 | umask 022\ | |
73 | @@ -1127,17 +1130,17 @@ | |
c9b276b0 JB |
74 | %_exec_prefix %{_prefix} |
75 | %_bindir %{_exec_prefix}/bin | |
76 | %_sbindir %{_exec_prefix}/sbin | |
77 | -%_libexecdir %{_exec_prefix}/libexec | |
78 | +%_libexecdir %{_exec_prefix}/lib | |
79 | %_datadir %{_prefix}/share | |
80 | -%_sysconfdir %{_prefix}/etc | |
81 | -%_sharedstatedir %{_prefix}/com | |
82 | -%_localstatedir %{_prefix}/var | |
83 | +%_sysconfdir /etc | |
84 | +%_sharedstatedir /var/lib | |
85 | +%_localstatedir /var | |
86 | %_lib lib | |
87 | %_libdir %{_exec_prefix}/%{_lib} | |
3bf6878c AM |
88 | %_includedir %{_prefix}/include |
89 | %_oldincludedir /usr/include | |
c9b276b0 | 90 | -%_infodir %{_prefix}/info |
3bf6878c | 91 | -%_mandir %{_prefix}/man |
c9b276b0 | 92 | +%_infodir %{_prefix}/share/info |
3bf6878c | 93 | +%_mandir %{_prefix}/share/man |
c9b276b0 | 94 | %_localedir %{_datadir}/locale |
3bf6878c AM |
95 | |
96 | #============================================================================== | |
d7636944 | 97 | @@ -1429,6 +1432,24 @@ |
c9b276b0 JB |
98 | #%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides |
99 | #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires | |
d488200a AM |
100 | -%__scriptlet_requires /bin/bash --rpm-requires |
101 | +#%__scriptlet_requires /bin/bash --rpm-requires | |
c9b276b0 | 102 | |
e493253e ER |
103 | +# PLD rpm macros |
104 | +%_enable_debug_packages 1 | |
105 | + | |
106 | +#----------------------------------------------------------------- | |
107 | +# CFLAGS and LDFLAGS used to build | |
108 | + | |
5dda5fa7 PS |
109 | +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}} |
110 | +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed. | |
e493253e ER |
111 | + |
112 | +%debugcflags -O0 -g -Wall | |
5b60995d | 113 | +%optldflags -Wl,--as-needed |
114 | + | |
115 | +# Warning: those macros are overwritten by macros.build, | |
116 | +# left here for compatibility | |
e493253e ER |
117 | +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} |
118 | +%rpmcxxflags %{rpmcflags} | |
4126bfd3 | 119 | +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed} |
c9b276b0 | 120 | + |
e493253e ER |
121 | # \endverbatim |
122 | #*/ | |
c9b276b0 JB |
123 | --- rpm-4.4.8/configure.ac.orig 2007-04-08 20:24:47.210783702 +0200 |
124 | +++ rpm-4.4.8/configure.ac 2007-04-08 20:32:18.216485052 +0200 | |
125 | @@ -1462,7 +1462,7 @@ | |
f587ec65 AM |
126 | [Full path to rpm system configuration directory (usually /etc/rpm)]) |
127 | AC_SUBST(SYSCONFIGDIR) | |
128 | ||
c9b276b0 JB |
129 | -MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros" |
130 | +MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros" | |
f587ec65 AM |
131 | AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES", |
132 | [Colon separated paths of macro files to read.]) | |
133 | AC_SUBST(MACROFILES) |