]>
Commit | Line | Data |
---|---|---|
9282ffe4 AF |
1 | --- rpm-5.2.0/macros.in.wiget 2010-04-24 18:05:03.413900239 +0200 |
2 | +++ rpm-5.2.0/macros.in 2010-04-24 18:06:23.963891557 +0200 | |
3 | @@ -220,7 +220,7 @@ pakietu oraz przy odpluskwianiu samego p | |
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} | |
9282ffe4 AF |
12 | @@ -253,14 +253,14 @@ pakietu oraz przy odpluskwianiu samego p |
13 | %_buildrootdir @BUILDROOTDIR_MACRO@ | |
14 | ||
15 | # Build root path, where %install installs the package during build. | |
16 | -%buildroot %{_buildrootdir}/%{name}-root | |
17 | +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n) | |
5bfda13a | 18 | |
c9b276b0 | 19 | -# Directory where temporaray files can be created. |
5bfda13a | 20 | -%_tmppath %{_var}/tmp |
c9b276b0 | 21 | +# Directory where temporary files can be created. |
5bfda13a | 22 | +%_tmppath %(echo "${TMPDIR:-/tmp}") |
c9b276b0 | 23 | %tmpdir %{_tmppath} |
e493253e ER |
24 | |
25 | # Path to top of build area. | |
fee89ffa | 26 | -%_topdir @PKGSRCDIR_MACRO@ |
dc6aae45 | 27 | +%_topdir %(echo $HOME)/rpm |
e493253e | 28 | |
c9b276b0 | 29 | #============================================================================== |
9282ffe4 AF |
30 | # ---- Optional macros. |
31 | @@ -367,8 +367,8 @@ pakietu oraz przy odpluskwianiu samego p | |
32 | # "w6.lzdio" lzma level 6 (legacy, stable). | |
33 | # "w6.xzdio" xz level 6 (obsoletes lzma, unstable). | |
3f2f32d6 ER |
34 | # |
35 | -#%_source_payload w9.gzdio | |
36 | -#%_binary_payload w9.gzdio | |
37 | +%_source_payload w9.gzdio | |
38 | +%_binary_payload w9.lzdio | |
39 | ||
40 | # Archive formats to use for source/binary package payloads. | |
41 | # "cpio" cpio archive (default) | |
9282ffe4 | 42 | @@ -1411,17 +1411,17 @@ print (t)\ |
c9b276b0 JB |
43 | %_exec_prefix %{_prefix} |
44 | %_bindir %{_exec_prefix}/bin | |
45 | %_sbindir %{_exec_prefix}/sbin | |
46 | -%_libexecdir %{_exec_prefix}/libexec | |
47 | +%_libexecdir %{_exec_prefix}/lib | |
48 | %_datadir %{_prefix}/share | |
49 | -%_sysconfdir %{_prefix}/etc | |
50 | -%_sharedstatedir %{_prefix}/com | |
51 | -%_localstatedir %{_prefix}/var | |
52 | +%_sysconfdir /etc | |
53 | +%_sharedstatedir /var/lib | |
54 | +%_localstatedir /var | |
55 | %_lib lib | |
56 | %_libdir %{_exec_prefix}/%{_lib} | |
3bf6878c AM |
57 | %_includedir %{_prefix}/include |
58 | %_oldincludedir /usr/include | |
c9b276b0 | 59 | -%_infodir %{_prefix}/info |
3bf6878c | 60 | -%_mandir %{_prefix}/man |
c9b276b0 | 61 | +%_infodir %{_prefix}/share/info |
3bf6878c | 62 | +%_mandir %{_prefix}/share/man |
c9b276b0 | 63 | %_localedir %{_datadir}/locale |
3bf6878c | 64 | |
9282ffe4 AF |
65 | %_initrddir %{_sysconfdir}/rc.d/init.d |
66 | @@ -1755,7 +1755,33 @@ PreReq: python >= %{python_version}, pyt | |
fee89ffa AM |
67 | # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. |
68 | #%__executable_provides %{_rpmhome}/executabledeps.sh --provides | |
69 | #%__executable_requires %{_rpmhome}/executabledeps.sh --requires | |
fec17460 JR |
70 | -%__scriptlet_requires %{__bash} --rpm-requires |
71 | +#%__scriptlet_requires %{__bash} --rpm-requires | |
c9b276b0 | 72 | |
e493253e ER |
73 | +# PLD rpm macros |
74 | +%_enable_debug_packages 1 | |
75 | + | |
9ddee74b AM |
76 | +# provides don't obsolete |
77 | +%_upgrade_tag name | |
78 | + | |
e493253e ER |
79 | +#----------------------------------------------------------------- |
80 | +# CFLAGS and LDFLAGS used to build | |
81 | + | |
5dda5fa7 PS |
82 | +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}} |
83 | +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed. | |
e493253e ER |
84 | + |
85 | +%debugcflags -O0 -g -Wall | |
5b60995d | 86 | +%optldflags -Wl,--as-needed |
87 | + | |
88 | +# Warning: those macros are overwritten by macros.build, | |
89 | +# left here for compatibility | |
e493253e ER |
90 | +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} |
91 | +%rpmcxxflags %{rpmcflags} | |
4126bfd3 | 92 | +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed} |
eb4e76ca AM |
93 | + |
94 | +# arch macros | |
95 | +%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon | |
96 | +%x8664 x86_64 amd64 ia32e | |
97 | +%ppc ppc ppc7400 ppc7450 | |
c9b276b0 | 98 | + |
e493253e ER |
99 | # \endverbatim |
100 | #*/ |