]>
Commit | Line | Data |
---|---|---|
a70fc0af ER |
1 | --- rpm-4.4.9/macros.in 2008-04-04 23:15:28.121279270 +0300 |
2 | +++ rpm-4.5/macros.in 2008-09-03 16:47:30.861766714 +0300 | |
fa78cfd4 | 3 | @@ -109,6 +109,10 @@ |
4 | %__automake automake | |
5 | %__autoconf autoconf | |
6 | ||
7 | +# compiler used to build kernel and kernel modules | |
8 | +%kgcc %{__cc} | |
9 | +%kgcc_package gcc | |
10 | + | |
11 | #============================================================================== | |
12 | # Conditional build stuff. | |
13 | ||
14 | @@ -206,7 +210,7 @@ | |
4d016095 AM |
15 | %endif\ |
16 | %{nil} | |
17 | ||
18 | -%_defaultdocdir %{_usr}/doc | |
19 | +%_defaultdocdir %{_usr}/share/doc | |
20 | ||
c9b276b0 JB |
21 | # The path to the pgp executable (legacy, use %{__pgp} instead). |
22 | %_pgpbin %{__pgp} | |
fa78cfd4 | 23 | @@ -233,12 +237,12 @@ |
c9b276b0 | 24 | # The directory where newly built source packages will be written. |
5bfda13a AM |
25 | %_srcrpmdir %{_topdir}/SRPMS |
26 | ||
c9b276b0 | 27 | -# Directory where temporaray files can be created. |
5bfda13a | 28 | -%_tmppath %{_var}/tmp |
c9b276b0 | 29 | +# Directory where temporary files can be created. |
5bfda13a | 30 | +%_tmppath %(echo "${TMPDIR:-/tmp}") |
c9b276b0 | 31 | %tmpdir %{_tmppath} |
e493253e ER |
32 | |
33 | # Path to top of build area. | |
dc6aae45 JB |
34 | -%_topdir %{_usrsrc}/rpm |
35 | +%_topdir %(echo $HOME)/rpm | |
e493253e | 36 | |
c9b276b0 JB |
37 | #============================================================================== |
38 | # ---- Optional rpmrc macros. | |
fa78cfd4 | 39 | @@ -248,7 +252,7 @@ |
5bfda13a AM |
40 | # Configurable build root path, same as BuildRoot: in a specfile. |
41 | # (Note: the configured macro value will override the spec file value). | |
42 | # | |
43 | -%buildroot %{_tmppath}/%{name}-root | |
44 | +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n) | |
45 | ||
46 | # The sub-directory (relative to %{_builddir}) where sources are compiled. | |
47 | # This macro is set after processing %setup, either explicitly from the | |
fa78cfd4 | 48 | @@ -347,8 +351,8 @@ |
3f2f32d6 | 49 | # "w9.bzdio" bzip2 level 9. |
c9b276b0 | 50 | # "w9.lzdio" lzma level 9. |
3f2f32d6 ER |
51 | # |
52 | -#%_source_payload w9.gzdio | |
53 | -#%_binary_payload w9.gzdio | |
54 | +%_source_payload w9.gzdio | |
55 | +%_binary_payload w9.lzdio | |
56 | ||
57 | # Archive formats to use for source/binary package payloads. | |
58 | # "cpio" cpio archive (default) | |
a70fc0af | 59 | @@ -508,7 +512,7 @@ |
e72fb97a AM |
60 | |
61 | # | |
62 | # Path to magic file used for file classification. | |
639079f5 | 63 | -%_rpmfc_magic_path %{_rpmhome}/magic |
e72fb97a AM |
64 | +%_rpmfc_magic_path /usr/share/file/magic |
65 | ||
66 | #============================================================================== | |
67 | # ---- Database configuration macros. | |
1827c8ac | 68 | @@ -954,7 +954,7 @@ |
69 | ||
70 | %___build_shell %{?_buildshell:%{_buildshell}}%{!?_buildshell:/bin/sh} | |
71 | %___build_args -e | |
72 | -%___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args} | |
73 | +%___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{?_clean_env:%{_clean_env} }%{___build_shell} %{___build_args} | |
74 | %___build_pre \ | |
75 | RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\ | |
76 | RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\ | |
fa78cfd4 | 77 | @@ -991,9 +995,12 @@ |
78 | %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ | |
79 | export CLASSPATH}\ | |
80 | unset PERL_MM_OPT || :\ | |
81 | - LANG=C\ | |
82 | - export LANG\ | |
83 | - unset DISPLAY || :\ | |
84 | + export LC_ALL=C\ | |
85 | + export LANG=C\ | |
86 | + unset LINGUAS ||:\ | |
87 | + unset LANGUAGE ||:\ | |
88 | + unset LC_MESSAGES ||:\ | |
89 | + unset DISPLAY ||:\ | |
90 | \ | |
91 | %{verbose:set -x}%{!verbose:exec > /dev/null}\ | |
92 | umask 022\ | |
93 | @@ -1127,17 +1134,17 @@ | |
c9b276b0 JB |
94 | %_exec_prefix %{_prefix} |
95 | %_bindir %{_exec_prefix}/bin | |
96 | %_sbindir %{_exec_prefix}/sbin | |
97 | -%_libexecdir %{_exec_prefix}/libexec | |
98 | +%_libexecdir %{_exec_prefix}/lib | |
99 | %_datadir %{_prefix}/share | |
100 | -%_sysconfdir %{_prefix}/etc | |
101 | -%_sharedstatedir %{_prefix}/com | |
102 | -%_localstatedir %{_prefix}/var | |
103 | +%_sysconfdir /etc | |
104 | +%_sharedstatedir /var/lib | |
105 | +%_localstatedir /var | |
106 | %_lib lib | |
107 | %_libdir %{_exec_prefix}/%{_lib} | |
3bf6878c AM |
108 | %_includedir %{_prefix}/include |
109 | %_oldincludedir /usr/include | |
c9b276b0 | 110 | -%_infodir %{_prefix}/info |
3bf6878c | 111 | -%_mandir %{_prefix}/man |
c9b276b0 | 112 | +%_infodir %{_prefix}/share/info |
3bf6878c | 113 | +%_mandir %{_prefix}/share/man |
c9b276b0 | 114 | %_localedir %{_datadir}/locale |
3bf6878c AM |
115 | |
116 | #============================================================================== | |
5382c075 | 117 | @@ -1429,6 +1436,22 @@ |
c9b276b0 JB |
118 | #%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides |
119 | #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires | |
d488200a AM |
120 | -%__scriptlet_requires /bin/bash --rpm-requires |
121 | +#%__scriptlet_requires /bin/bash --rpm-requires | |
fa78cfd4 | 122 | + |
e493253e ER |
123 | +# PLD rpm macros |
124 | +%_enable_debug_packages 1 | |
125 | + | |
126 | +#----------------------------------------------------------------- | |
127 | +# CFLAGS and LDFLAGS used to build | |
128 | + | |
42989f78 | 129 | +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-3 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}} |
e493253e ER |
130 | + |
131 | +%debugcflags -O0 -g -Wall | |
fa78cfd4 | 132 | |
5b60995d | 133 | +# Warning: those macros are overwritten by macros.build, |
134 | +# left here for compatibility | |
e493253e ER |
135 | +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} |
136 | +%rpmcxxflags %{rpmcflags} | |
4126bfd3 | 137 | +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed} |
c9b276b0 | 138 | + |
a70fc0af ER |
139 | # \endverbatim |
140 | #*/ | |
141 | @@ -1480,7 +1504,7 @@ | |
142 | # | |
143 | # Note: Used if _use_internal_dependency_generator is non-zero. The | |
144 | # helper is also used by %{_rpmhome}/rpmdeps --provides | |
145 | -#%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides | |
146 | +%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides | |
147 | ||
e493253e ER |
148 | # \endverbatim |
149 | #*/ | |
639079f5 ER |
150 | --- rpm-4.5/configure.ac~ 2008-06-10 02:03:07.000000000 +0300 |
151 | +++ rpm-4.5/configure.ac 2008-06-10 02:04:18.395836371 +0300 | |
152 | @@ -1479,7 +1479,7 @@ | |
f587ec65 AM |
153 | [Full path to rpm system configuration directory (usually /etc/rpm)]) |
154 | AC_SUBST(SYSCONFIGDIR) | |
155 | ||
639079f5 | 156 | -MACROFILES="${USRLIBRPM}/${VERSION}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/%{_host_vendor}/macros:${SYSCONFIGDIR}/%{_host_vendor}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros.d/*.macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros" |
c9b276b0 | 157 | +MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros" |
f587ec65 AM |
158 | AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES", |
159 | [Colon separated paths of macro files to read.]) | |
160 | AC_SUBST(MACROFILES) |