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
12 %__install_info @__INSTALL_INFO@
13 %__ldconfig @__LDCONFIG@
33 #==============================================================================
34 # ---- Build system path macros.
39 +# compiler used to build kernel and kernel modules
43 #==============================================================================
44 # Conditional build stuff.
50 -%_defaultdocdir %{_usr}/doc
51 +%_defaultdocdir %{_usr}/share/doc
53 # The path to the pgp executable (legacy, use %{__pgp} instead).
56 # The directory where newly built source packages will be written.
57 %_srcrpmdir %{_topdir}/SRPMS
59 -# Directory where temporaray files can be created.
60 -%_tmppath %{_var}/tmp
61 +# Directory where temporary files can be created.
62 +%_tmppath %(echo "${TMPDIR:-/tmp}")
65 # Path to top of build area.
66 -%_topdir %{_usrsrc}/rpm
67 +%_topdir %(echo $HOME)/rpm
69 #==============================================================================
70 # ---- Optional rpmrc macros.
72 # Configurable build root path, same as BuildRoot: in a specfile.
73 # (Note: the configured macro value will override the spec file value).
75 -%buildroot %{_tmppath}/%{name}-root
76 +%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
78 # The sub-directory (relative to %{_builddir}) where sources are compiled.
79 # This macro is set after processing %setup, either explicitly from the
81 # "w9.bzdio" bzip2 level 9.
82 # "w9.lzdio" lzma level 9.
84 -#%_source_payload w9.gzdio
85 -#%_binary_payload w9.gzdio
86 +%_source_payload w9.gzdio
87 +%_binary_payload w9.lzdio
89 # Archive formats to use for source/binary package payloads.
90 # "cpio" cpio archive (default)
94 # Path to magic file used for file classification.
95 -%_rpmfc_magic_path %{_rpmhome}/magic
96 +%_rpmfc_magic_path /usr/share/file/magic
98 #==============================================================================
99 # ---- Database configuration macros.
102 %___build_shell %{?_buildshell:%{_buildshell}}%{!?_buildshell:/bin/sh}
104 -%___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
105 +%___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{?_clean_env:%{_clean_env} }%{___build_shell} %{___build_args}
107 RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
108 RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
110 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
112 unset PERL_MM_OPT || :\
115 - unset DISPLAY || :\
119 + unset LANGUAGE ||:\
120 + unset LC_MESSAGES ||:\
123 %{verbose:set -x}%{!verbose:exec > /dev/null}\
125 @@ -1127,17 +1134,17 @@
126 %_exec_prefix %{_prefix}
127 %_bindir %{_exec_prefix}/bin
128 %_sbindir %{_exec_prefix}/sbin
129 -%_libexecdir %{_exec_prefix}/libexec
130 +%_libexecdir %{_exec_prefix}/lib
131 %_datadir %{_prefix}/share
132 -%_sysconfdir %{_prefix}/etc
133 -%_sharedstatedir %{_prefix}/com
134 -%_localstatedir %{_prefix}/var
136 +%_sharedstatedir /var/lib
137 +%_localstatedir /var
139 %_libdir %{_exec_prefix}/%{_lib}
140 %_includedir %{_prefix}/include
141 %_oldincludedir /usr/include
142 -%_infodir %{_prefix}/info
143 -%_mandir %{_prefix}/man
144 +%_infodir %{_prefix}/share/info
145 +%_mandir %{_prefix}/share/man
146 %_localedir %{_datadir}/locale
148 #==============================================================================
149 @@ -1429,6 +1436,22 @@
150 #%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides
151 #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires
152 -%__scriptlet_requires /bin/bash --rpm-requires
153 +#%__scriptlet_requires /bin/bash --rpm-requires
156 +%_enable_debug_packages 1
158 +#-----------------------------------------------------------------
159 +# CFLAGS and LDFLAGS used to build
161 +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-4 -fno-debug-types-section -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
163 +%debugcflags -O0 -g -Wall
165 +# Warning: those macros are overwritten by macros.build,
166 +# left here for compatibility
167 +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
168 +%rpmcxxflags %{rpmcflags}
169 +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
173 @@ -1480,7 +1504,7 @@
175 # Note: Used if _use_internal_dependency_generator is non-zero. The
176 # helper is also used by %{_rpmhome}/rpmdeps --provides
177 -#%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides
178 +%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides
182 --- rpm-4.5/configure.ac~ 2008-06-10 02:03:07.000000000 +0300
183 +++ rpm-4.5/configure.ac 2008-06-10 02:04:18.395836371 +0300
185 AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
186 AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
187 AC_PATH_PROG(__FIND, find, %{_bindir}/find, $MYPATH)
188 +AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH)
189 AC_PATH_PROG(__GPG, gpg, %{_bindir}/gpg, $MYPATH)
190 AC_PATH_PROG(__GREP, grep, /bin/grep, $MYPATH)
191 AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH)
194 AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH)
195 AC_PATH_PROG(__INSTALL_INFO, install-info, /sbin/install-info, $MYPATH)
196 +AC_PATH_PROG(__LN, ln, /bin/ln, $MYPATH)
197 AC_PATH_PROG(__LDCONFIG, ldconfig, /sbin/ldconfig, $MYPATH)
198 AC_PATH_PROG(__LUA, lua, %{_bindir}/lua, $MYPATH)
199 AC_PATH_PROG(__LZMA, lzma, %{_bindir}/lzma, $MYPATH)
201 AC_PATH_PROG(__PHP, php, %{_bindir}/php, $MYPATH)
202 AC_PATH_PROG(__PYTHON, python, %{_bindir}/python, $MYPATH)
203 AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
204 +AC_PATH_PROG(__RMDIR, rmdir, /bin/rmdir, $MYPATH)
205 AC_PATH_PROG(__RSH, rsh, %{_bindir}/rsh, $MYPATH)
206 AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
207 AC_PATH_PROG(__SH, sh, /bin/sh, $MYPATH)
209 AC_PATH_PROG(__UNZIP, unzip, %{_bindir}/unzip, $MYPATH)
210 AC_PATH_PROG(__WGET, wget, %{_bindir}/wget, $MYPATH)
211 AC_PATH_PROG(__XAR, xar, %{_bindir}/xar, $MYPATH)
212 +AC_PATH_PROG(__XZ, xz, %{_bindir}/xz, $MYPATH)
214 AC_PATH_PROG(__LD, ld, %{_bindir}/ld, $MYPATH)
215 AC_PATH_PROG(__NM, nm, %{_bindir}/nm, $MYPATH)
216 @@ -1479,7 +1479,7 @@
217 [Full path to rpm system configuration directory (usually /etc/rpm)])
218 AC_SUBST(SYSCONFIGDIR)
220 -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"
221 +MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
222 AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
223 [Colon separated paths of macro files to read.])