]>
Commit | Line | Data |
---|---|---|
c9b276b0 JB |
1 | --- rpm-4.4.8/macros.in.orig 2007-04-08 20:24:47.206783474 +0200 |
2 | +++ rpm-4.4.8/macros.in 2007-04-08 20:36:08.925632417 +0200 | |
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. | |
c9b276b0 JB |
57 | @@ -1127,17 +1127,17 @@ |
58 | %_exec_prefix %{_prefix} | |
59 | %_bindir %{_exec_prefix}/bin | |
60 | %_sbindir %{_exec_prefix}/sbin | |
61 | -%_libexecdir %{_exec_prefix}/libexec | |
62 | +%_libexecdir %{_exec_prefix}/lib | |
63 | %_datadir %{_prefix}/share | |
64 | -%_sysconfdir %{_prefix}/etc | |
65 | -%_sharedstatedir %{_prefix}/com | |
66 | -%_localstatedir %{_prefix}/var | |
67 | +%_sysconfdir /etc | |
68 | +%_sharedstatedir /var/lib | |
69 | +%_localstatedir /var | |
70 | %_lib lib | |
71 | %_libdir %{_exec_prefix}/%{_lib} | |
3bf6878c AM |
72 | %_includedir %{_prefix}/include |
73 | %_oldincludedir /usr/include | |
c9b276b0 | 74 | -%_infodir %{_prefix}/info |
3bf6878c | 75 | -%_mandir %{_prefix}/man |
c9b276b0 | 76 | +%_infodir %{_prefix}/share/info |
3bf6878c | 77 | +%_mandir %{_prefix}/share/man |
c9b276b0 | 78 | %_localedir %{_datadir}/locale |
3bf6878c AM |
79 | |
80 | #============================================================================== | |
c9b276b0 JB |
81 | @@ -1428,7 +1428,25 @@ |
82 | # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}. | |
83 | #%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides | |
84 | #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires | |
d488200a AM |
85 | -%__scriptlet_requires /bin/bash --rpm-requires |
86 | +#%__scriptlet_requires /bin/bash --rpm-requires | |
c9b276b0 | 87 | |
e493253e ER |
88 | +# PLD rpm macros |
89 | +%_enable_debug_packages 1 | |
90 | + | |
91 | +#----------------------------------------------------------------- | |
92 | +# CFLAGS and LDFLAGS used to build | |
93 | + | |
5dda5fa7 PS |
94 | +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}} |
95 | +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed. | |
e493253e ER |
96 | + |
97 | +%debugcflags -O0 -g -Wall | |
5b60995d | 98 | +%optldflags -Wl,--as-needed |
99 | + | |
100 | +# Warning: those macros are overwritten by macros.build, | |
101 | +# left here for compatibility | |
e493253e ER |
102 | +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} |
103 | +%rpmcxxflags %{rpmcflags} | |
4126bfd3 | 104 | +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed} |
c9b276b0 | 105 | + |
e493253e ER |
106 | # \endverbatim |
107 | #*/ | |
c9b276b0 JB |
108 | --- rpm-4.4.8/configure.ac.orig 2007-04-08 20:24:47.210783702 +0200 |
109 | +++ rpm-4.4.8/configure.ac 2007-04-08 20:32:18.216485052 +0200 | |
110 | @@ -1462,7 +1462,7 @@ | |
f587ec65 AM |
111 | [Full path to rpm system configuration directory (usually /etc/rpm)]) |
112 | AC_SUBST(SYSCONFIGDIR) | |
113 | ||
c9b276b0 JB |
114 | -MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros" |
115 | +MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros" | |
f587ec65 AM |
116 | AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES", |
117 | [Colon separated paths of macro files to read.]) | |
118 | AC_SUBST(MACROFILES) |