rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

always delete %buildroot at %install (unless it is /)

Browse Source
This commit is contained in:
Tom Callaway 2009-07-21 17:35:50 +00:00
parent 8cfdc299c7
commit 32d33e8f11
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch Normal file
View File

@ -0,0 +1,21 @@
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.
#

7
redhat-rpm-config.spec
View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files. Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 9.0.3 Version: 9.0.3
Release: 10%{?dist} Release: 11%{?dist}
# No version specified. # No version specified.
License: GPL+ License: GPL+
Group: Development/System Group: Development/System
@ -11,6 +11,7 @@ Patch1: limit-smp-16-threads.patch
Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch
Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
Patch4: redhat-rpm-config-9.0.3-F-12-Architectures.patch Patch4: redhat-rpm-config-9.0.3-F-12-Architectures.patch
Patch5: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
BuildArch: noarch BuildArch: noarch
Requires: mktemp Requires: mktemp
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@ -25,6 +26,7 @@ Red Hat specific rpm configuration files.
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%install %install
make DESTDIR=${RPM_BUILD_ROOT} install make DESTDIR=${RPM_BUILD_ROOT} install
@ -37,6 +39,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat %{_prefix}/lib/rpm/redhat
%changelog %changelog
* Tue Jul 21 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 9.0.3-10
- always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
* Fri Jul 17 2009 Bill Nottingham <notting@redhat.com> 9.0.3-10 * Fri Jul 17 2009 Bill Nottingham <notting@redhat.com> 9.0.3-10
- apply fedora 12 default buildflags - apply fedora 12 default buildflags