[packages/rpm.git] / rpm-fix-___build_pre-macro.patch

--- rpm-5.4.10/macros/macros.rpmbuild.in.old	2012-09-15 19:31:55.178325519 +0200
+++ rpm-5.4.10/macros/macros.rpmbuild.in	2012-09-15 19:32:37.158324039 +0200
@@ -324,8 +324,18 @@
 %___build_args		-e
 %___build_cmd		%{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
 %___build_pre	\
+  RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
+  RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
   RPM_OPT_FLAGS=\"%{optflags}\"\
-  export RPM_OPT_FLAGS\
+  RPM_ARCH=\"%{_arch}\"\
+  RPM_OS=\"%{_os}\"\
+  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
+  RPM_DOC_DIR=\"%{_docdir}\"\
+  export RPM_DOC_DIR\
+  RPM_PACKAGE_NAME=\"%{name}\"\
+  RPM_PACKAGE_VERSION=\"%{version}\"\
+  RPM_PACKAGE_RELEASE=\"%{release}\"\
+  export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
   %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
   export RPM_BUILD_ROOT}\
   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
Commit	Line	Data
	1	--- rpm-5.4.10/macros/macros.rpmbuild.in.old 2012-09-15 19:31:55.178325519 +0200
	2	+++ rpm-5.4.10/macros/macros.rpmbuild.in 2012-09-15 19:32:37.158324039 +0200
	3	@@ -324,8 +324,18 @@
	4	%___build_args -e
	5	%___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
	6	%___build_pre \
	7	+ RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
	8	+ RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
	9	RPM_OPT_FLAGS=\"%{optflags}\"\
	10	- export RPM_OPT_FLAGS\
	11	+ RPM_ARCH=\"%{_arch}\"\
	12	+ RPM_OS=\"%{_os}\"\
	13	+ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
	14	+ RPM_DOC_DIR=\"%{_docdir}\"\
	15	+ export RPM_DOC_DIR\
	16	+ RPM_PACKAGE_NAME=\"%{name}\"\
	17	+ RPM_PACKAGE_VERSION=\"%{version}\"\
	18	+ RPM_PACKAGE_RELEASE=\"%{release}\"\
	19	+ export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
	20	%{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
	21	export RPM_BUILD_ROOT}\
	22	%{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\