1 --- rpm-5.3.1/macros/macros.rpmbuild.in.wiget 2010-05-30 17:03:38.009271449 +0200
2 +++ rpm-5.3.1/macros/macros.rpmbuild.in 2010-05-30 17:08:25.676741951 +0200
4 # "w6.lzdio" lzma level 6 (legacy, stable).
5 # "w6.xzdio" xz level 6 (obsoletes lzma, unstable).
7 -#%_source_payload w9.gzdio
8 -#%_binary_payload w9.gzdio
9 +%_source_payload w9.gzdio
10 +%_binary_payload w9.lzdio
12 # Archive formats to use for source/binary package payloads.
13 # "cpio" cpio archive (default)
14 --- rpm-5.3.1/macros/macros.in.wiget 2010-05-30 17:03:38.009271449 +0200
15 +++ rpm-5.3.1/macros/macros.in 2010-05-30 17:06:26.886075137 +0200
16 @@ -150,7 +150,7 @@ pakietu oraz przy odpluskwianiu samego p
20 -%_defaultdocdir %{_usr}/doc
21 +%_defaultdocdir %{_usr}/share/doc
23 # The path to the pgp executable (legacy, use %{__pgp} instead).
25 @@ -183,14 +183,14 @@ pakietu oraz przy odpluskwianiu samego p
26 %_buildrootdir @BUILDROOTDIR_MACRO@
28 # Build root path, where %install installs the package during build.
29 -%buildroot %{_buildrootdir}/%{name}-root
30 +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
32 -# Directory where temporaray files can be created.
33 -%_tmppath %{_var}/tmp
34 +# Directory where temporary files can be created.
35 +%_tmppath %(echo "${TMPDIR:-/tmp}")
38 # Path to top of build area.
39 -%_topdir @PKGSRCDIR_MACRO@
40 +%_topdir %(echo $HOME)/rpm
42 #==============================================================================
43 # ---- Optional macros.
44 @@ -846,11 +846,11 @@ pakietu oraz przy odpluskwianiu samego p
45 %_datarootdir %{_prefix}/share
46 %_bindir %{_exec_prefix}/bin
47 %_sbindir %{_exec_prefix}/sbin
48 -%_libexecdir %{_exec_prefix}/libexec
49 +%_libexecdir %{_exec_prefix}/lib
50 %_datadir %{_datarootdir}
51 -%_sysconfdir %{_prefix}/etc
52 -%_sharedstatedir %{_prefix}/com
53 -%_localstatedir %{_prefix}/var
55 +%_sharedstatedir /var/lib
58 %_libdir %{_exec_prefix}/%{_lib}
59 %_includedir %{_prefix}/include
60 @@ -941,7 +941,33 @@ pakietu oraz przy odpluskwianiu samego p
61 # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
62 #%__executable_provides %{_rpmhome}/executabledeps.sh --provides
63 #%__executable_requires %{_rpmhome}/executabledeps.sh --requires
64 -%__scriptlet_requires %{__bash} --rpm-requires
65 +#%__scriptlet_requires %{__bash} --rpm-requires
68 +%_enable_debug_packages 1
70 +# provides don't obsolete
73 +#-----------------------------------------------------------------
74 +# CFLAGS and LDFLAGS used to build
76 +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
77 +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
79 +%debugcflags -O0 -g -Wall
80 +%optldflags -Wl,--as-needed
82 +# Warning: those macros are overwritten by macros.build,
83 +# left here for compatibility
84 +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
85 +%rpmcxxflags %{rpmcflags}
86 +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
89 +%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
90 +%x8664 x86_64 amd64 ia32e
91 +%ppc ppc ppc7400 ppc7450
93 #==============================================================================
95 # XXX With %{load:...} being interpreted immediately -- not lazily --