rpms/redhat-rpm-config/F-11 redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch, NONE, 1.1 redhat-rpm-config.spec, 1.63, 1.64
Tom Callaway
spot at fedoraproject.org
Tue Jul 21 17:36:20 UTC 2009
Author: spot
Update of /cvs/pkgs/rpms/redhat-rpm-config/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24169/F-11
Modified Files:
redhat-rpm-config.spec
Added Files:
redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
Log Message:
always delete %buildroot at %install (unless it is /)
redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch:
macros | 11 +++++++++++
1 file changed, 11 insertions(+)
--- NEW FILE redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch ---
diff -up redhat-rpm-config-9.0.3/macros.BAD redhat-rpm-config-9.0.3/macros
--- redhat-rpm-config-9.0.3/macros.BAD 2009-07-21 13:22:43.427201497 -0400
+++ redhat-rpm-config-9.0.3/macros 2009-07-21 13:23:57.692440712 -0400
@@ -73,6 +73,17 @@
#==============================================================================
# ---- Build policy macros.
#
+#
+#---------------------------------------------------------------------
+# Expanded at beginning of %install scriptlet.
+#
+
+%__spec_install_pre %{___build_pre}\
+ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
+ mkdir -p `dirname "$RPM_BUILD_ROOT"`\
+ mkdir "$RPM_BUILD_ROOT"\
+%{nil}
+
#---------------------------------------------------------------------
# Expanded at end of %install scriptlet.
#
Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/F-11/redhat-rpm-config.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- redhat-rpm-config.spec 3 Jun 2009 19:17:55 -0000 1.63
+++ redhat-rpm-config.spec 21 Jul 2009 17:35:50 -0000 1.64
@@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config
Version: 9.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@@ -10,6 +10,7 @@ Patch0: redhat-rpm-config-9.0.3-fix-requ
Patch1: limit-smp-16-threads.patch
Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch
Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
+Patch4: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
BuildArch: noarch
Requires: mktemp
BuildRoot: %{_tmppath}/%{name}-root
@@ -23,6 +24,7 @@ Red Hat specific rpm configuration files
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%install
make DESTDIR=${RPM_BUILD_ROOT} install
@@ -35,6 +37,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat
%changelog
+* Tue Jul 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.3-10
+- always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
+
* Wed Jun 03 2009 Adam Jackson <ajax at redhat.com> 9.0.3-9
- limit-smp-16-threads.patch: Rediff so we don't ship a .orig file (#500316)
More information about the fedora-extras-commits
mailing list