On Wednesday, 23 May 2007, at 17:26:40 (-0500),
Tim Mooney wrote:
> Index: parseBuildInstallClean.c
> ===================================================================
> RCS file: /cvs/devel/rpm/build/parseBuildInstallClean.c,v
> retrieving revision 2.18.6.4
> diff -u -r2.18.6.4 parseBuildInstallClean.c
> --- parseBuildInstallClean.c 21 Mar 2007 13:10:15 -0000 2.18.6.4
> +++ parseBuildInstallClean.c 23 May 2007 22:25:53 -0000
> @@ -42,12 +42,12 @@
>
> /* Make sure the buildroot is removed where needed. */
> if (parsePart == PART_INSTALL) {
> - const char * s =
> rpmExpand("%{?__spec_clean_body}%{!?__spec_clean_body:%{?buildroot:rm -rf
> '%{buildroot}'\n}}\n", NULL);
> + const char * s = rpmExpand("%{?buildroot:rm -rf '%{buildroot}'\n}",
> NULL);
> if (s && *s)
> appendStringBuf(*sbp, s);
> s = _free(s);
> } else if (parsePart == PART_CLEAN) {
> - const char * s = rpmExpand("%{?buildroot:rm -rf '%{buildroot}'\n}",
> NULL);
> + const char * s =
> rpmExpand("%{?__spec_clean_body}%{!?__spec_clean_body:%{?buildroot:rm -rf
> '%{buildroot}'\n}}\n", NULL);
> if (s && *s)
> appendStringBuf(*sbp, s);
> s = _free(s);
Should probably be coupled with the attached patch I did for 4.4.9 to
properly allow overriding of the rm -rf buildroot for %install (which,
it turns out, is required for many kernel SRPM's).
Michael
--
Michael Jennings (a.k.a. KainX) http://www.kainx.org/ <mej@xxxxxxxxx>
n + 1, Inc., http://www.nplus1.net/ Author, Eterm (www.eterm.org)
-----------------------------------------------------------------------
"To touch the rose unfearful is to meet the thorn and pierce the
heart's emotion and feel the emptiness no more."
-- Jars of Clay, "No One Loves Me Like You"
diff -Nur -x '*.orig' -x '*.rej' rpm-4.4.9/build/parseBuildInstallClean.c mezzanine_patched_rpm-4.4.9/build/parseBuildInstallClean.c
--- rpm-4.4.9/build/parseBuildInstallClean.c 2007-03-21 07:29:49.000000000 -0400
+++ mezzanine_patched_rpm-4.4.9/build/parseBuildInstallClean.c 2007-05-05 17:14:51.000000000 -0400
@@ -42,7 +42,7 @@
/* Make sure the buildroot is removed where needed. */
if (parsePart == PART_INSTALL) {
- const char * s = rpmExpand("%{?__spec_clean_body}%{!?__spec_clean_body:%{?buildroot:rm -rf '%{buildroot}'\n}}\n", NULL);
+ const char * s = rpmExpand("%{!?__spec_install_pre:%{?buildroot:rm -rf '%{buildroot}'\n}}\n", NULL);
if (s && *s)
appendStringBuf(*sbp, s);
s = _free(s);
_______________________________________________
Rpm-list mailing list
Rpm-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/rpm-list
