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
7 +# compiler used to build kernel and kernel modules
11 #==============================================================================
12 # Conditional build stuff.
18 -%_defaultdocdir %{_usr}/doc
19 +%_defaultdocdir %{_usr}/share/doc
21 # The path to the pgp executable (legacy, use %{__pgp} instead).
24 # The directory where newly built source packages will be written.
25 %_srcrpmdir %{_topdir}/SRPMS
27 -# Directory where temporaray files can be created.
28 -%_tmppath %{_var}/tmp
29 +# Directory where temporary files can be created.
30 +%_tmppath %(echo "${TMPDIR:-/tmp}")
33 # Path to top of build area.
34 -%_topdir %{_usrsrc}/rpm
35 +%_topdir %(echo $HOME)/rpm
37 #==============================================================================
38 # ---- Optional rpmrc macros.
40 # Configurable build root path, same as BuildRoot: in a specfile.
41 # (Note: the configured macro value will override the spec file value).
43 -%buildroot %{_tmppath}/%{name}-root
44 +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
46 # The sub-directory (relative to %{_builddir}) where sources are compiled.
47 # This macro is set after processing %setup, either explicitly from the
49 # "w9.bzdio" bzip2 level 9.
50 # "w9.lzdio" lzma level 9.
52 -#%_source_payload w9.gzdio
53 -#%_binary_payload w9.gzdio
54 +%_source_payload w9.gzdio
55 +%_binary_payload w9.lzdio
57 # Archive formats to use for source/binary package payloads.
58 # "cpio" cpio archive (default)
62 # Path to magic file used for file classification.
63 -%_rpmfc_magic_path %{_rpmhome}/magic
64 +%_rpmfc_magic_path /usr/share/file/magic
66 #==============================================================================
67 # ---- Database configuration macros.
69 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
71 unset PERL_MM_OPT || :\
79 + unset LC_MESSAGES ||:\
82 %{verbose:set -x}%{!verbose:exec > /dev/null}\
84 @@ -1127,17 +1134,17 @@
85 %_exec_prefix %{_prefix}
86 %_bindir %{_exec_prefix}/bin
87 %_sbindir %{_exec_prefix}/sbin
88 -%_libexecdir %{_exec_prefix}/libexec
89 +%_libexecdir %{_exec_prefix}/lib
90 %_datadir %{_prefix}/share
91 -%_sysconfdir %{_prefix}/etc
92 -%_sharedstatedir %{_prefix}/com
93 -%_localstatedir %{_prefix}/var
95 +%_sharedstatedir /var/lib
98 %_libdir %{_exec_prefix}/%{_lib}
99 %_includedir %{_prefix}/include
100 %_oldincludedir /usr/include
101 -%_infodir %{_prefix}/info
102 -%_mandir %{_prefix}/man
103 +%_infodir %{_prefix}/share/info
104 +%_mandir %{_prefix}/share/man
105 %_localedir %{_datadir}/locale
107 #==============================================================================
108 @@ -1429,6 +1436,23 @@
109 #%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides
110 #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires
111 -%__scriptlet_requires /bin/bash --rpm-requires
112 +#%__scriptlet_requires /bin/bash --rpm-requires
115 +%_enable_debug_packages 1
117 +#-----------------------------------------------------------------
118 +# CFLAGS and LDFLAGS used to build
120 +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
121 +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
123 +%debugcflags -O0 -g -Wall
125 +# Warning: those macros are overwritten by macros.build,
126 +# left here for compatibility
127 +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
128 +%rpmcxxflags %{rpmcflags}
129 +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
133 @@ -1480,7 +1504,7 @@
135 # Note: Used if _use_internal_dependency_generator is non-zero. The
136 # helper is also used by %{_rpmhome}/rpmdeps --provides
137 -#%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides
138 +%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides
142 --- rpm-4.5/configure.ac~ 2008-06-10 02:03:07.000000000 +0300
143 +++ rpm-4.5/configure.ac 2008-06-10 02:04:18.395836371 +0300
144 @@ -1479,7 +1479,7 @@
145 [Full path to rpm system configuration directory (usually /etc/rpm)])
146 AC_SUBST(SYSCONFIGDIR)
148 -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"
149 +MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
150 AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
151 [Colon separated paths of macro files to read.])