[gnome-sdk-images] Move clean of build root to macro

From: Alexander Larsson <alexl src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-sdk-images] Move clean of build root to macro
Date: Wed, 25 Mar 2015 14:16:56 +0000 (UTC)
commit 16a7407193e5e9e6d13f4bbbd23da2df8769812d
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Mar 25 14:06:47 2015 +0100

    Move clean of build root to macro
    
    This ensures it always happens, and we don't need to manually do it in the
    specfiles.

 packages/.rpmmacros                                |    6 ++++++
 packages/SPECS/dbus-glib.spec                      |    2 --
 packages/SPECS/dbus.spec                           |    2 --
 packages/SPECS/dejavu-fonts.spec                   |    2 --
 packages/SPECS/enchant.spec                        |    1 -
 packages/SPECS/freedesktop-platform.spec           |    2 --
 packages/SPECS/freedesktop-sdk.spec                |    2 --
 packages/SPECS/freetype.spec                       |    3 ---
 packages/SPECS/gnome-platform.spec                 |    2 --
 packages/SPECS/gnome-sdk.spec                      |    2 --
 packages/SPECS/gnu-free-fonts.spec                 |    2 --
 packages/SPECS/google-crosextra-caladea-fonts.spec |    2 --
 packages/SPECS/google-crosextra-carlito-fonts.spec |    2 --
 packages/SPECS/gstreamer1-plugins-base.spec        |    1 -
 packages/SPECS/gstreamer1.spec                     |    1 -
 packages/SPECS/hicolor-icon-theme.spec             |    1 -
 packages/SPECS/hunspell-en.spec                    |    1 -
 packages/SPECS/hunspell.spec                       |    1 -
 packages/SPECS/libICE.spec                         |    2 --
 packages/SPECS/libSM.spec                          |    2 --
 packages/SPECS/libX11.spec                         |    2 --
 packages/SPECS/libXau.spec                         |    2 --
 packages/SPECS/libXcomposite.spec                  |    1 -
 packages/SPECS/libXcursor.spec                     |    2 --
 packages/SPECS/libXdamage.spec                     |    2 --
 packages/SPECS/libXdmcp.spec                       |    2 --
 packages/SPECS/libXext.spec                        |    2 --
 packages/SPECS/libXfixes.spec                      |    2 --
 packages/SPECS/libXft.spec                         |    2 --
 packages/SPECS/libXi.spec                          |    2 --
 packages/SPECS/libXinerama.spec                    |    2 --
 packages/SPECS/libXpm.spec                         |    2 --
 packages/SPECS/libXrandr.spec                      |    2 --
 packages/SPECS/libXrender.spec                     |    2 --
 packages/SPECS/libXt.spec                          |    2 --
 packages/SPECS/libXtst.spec                        |    2 --
 packages/SPECS/libXv.spec                          |    2 --
 packages/SPECS/liberation-fonts.spec               |    3 ---
 packages/SPECS/libpciaccess.spec                   |    1 -
 packages/SPECS/libthai.spec                        |    2 --
 packages/SPECS/libxcb.spec                         |    1 -
 packages/SPECS/libxkbfile.spec                     |    2 --
 packages/SPECS/llvm.spec                           |    2 --
 packages/SPECS/mesa.spec                           |    2 --
 packages/SPECS/wayland.spec                        |    1 -
 packages/SPECS/xcb-proto.spec                      |    1 -
 46 files changed, 6 insertions(+), 81 deletions(-)
---
diff --git a/packages/.rpmmacros b/packages/.rpmmacros
index 8572ac8..f6fba10 100644
--- a/packages/.rpmmacros
+++ b/packages/.rpmmacros
@@ -19,3 +19,9 @@
 %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
 %%install\
 %{nil}
+
+%__spec_install_pre %{___build_pre}\
+    [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
+    mkdir -p `dirname "$RPM_BUILD_ROOT"`\
+    mkdir "$RPM_BUILD_ROOT"\
+%{nil}
diff --git a/packages/SPECS/dbus-glib.spec b/packages/SPECS/dbus-glib.spec
index 53c8060..49477e3 100644
--- a/packages/SPECS/dbus-glib.spec
+++ b/packages/SPECS/dbus-glib.spec
@@ -41,8 +41,6 @@ Headers and static libraries for the D-Bus GLib bindings
 make
 
 %install
-rm -rf %{buildroot}
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
diff --git a/packages/SPECS/dbus.spec b/packages/SPECS/dbus.spec
index 210bc5a..9a9afe3 100644
--- a/packages/SPECS/dbus.spec
+++ b/packages/SPECS/dbus.spec
@@ -68,8 +68,6 @@ if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -
 make
 
 %install
-rm -rf %{buildroot}
-
 make install DESTDIR=%{buildroot}
 
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig
diff --git a/packages/SPECS/dejavu-fonts.spec b/packages/SPECS/dejavu-fonts.spec
index 3e908eb..e1d7530 100644
--- a/packages/SPECS/dejavu-fonts.spec
+++ b/packages/SPECS/dejavu-fonts.spec
@@ -27,8 +27,6 @@ original style, using an open collaborative development process.
 
 
 %install
-rm -fr %{buildroot}
-
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p ttf/*.ttf %{buildroot}%{_fontdir}
 
diff --git a/packages/SPECS/enchant.spec b/packages/SPECS/enchant.spec
index 6f0ca8c..3a782e0 100644
--- a/packages/SPECS/enchant.spec
+++ b/packages/SPECS/enchant.spec
@@ -31,7 +31,6 @@ Libraries, headers, and support files necessary to compile applications using li
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
diff --git a/packages/SPECS/freedesktop-platform.spec b/packages/SPECS/freedesktop-platform.spec
index 1be15ef..733deb0 100644
--- a/packages/SPECS/freedesktop-platform.spec
+++ b/packages/SPECS/freedesktop-platform.spec
@@ -113,8 +113,6 @@ Meta package for Freedesktop platform dependencies
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Need empty machine-id to bind mount over
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/
 touch $RPM_BUILD_ROOT%{_sysconfdir}/machine-id
diff --git a/packages/SPECS/freedesktop-sdk.spec b/packages/SPECS/freedesktop-sdk.spec
index 5185bdd..24ed3b9 100644
--- a/packages/SPECS/freedesktop-sdk.spec
+++ b/packages/SPECS/freedesktop-sdk.spec
@@ -80,8 +80,6 @@ Meta package for Gnome SDK dependencies
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros
 
diff --git a/packages/SPECS/freetype.spec b/packages/SPECS/freetype.spec
index a5b43be..6b7bbe6 100644
--- a/packages/SPECS/freetype.spec
+++ b/packages/SPECS/freetype.spec
@@ -69,9 +69,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-
 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
 
 # Don't package static a or .la files
diff --git a/packages/SPECS/gnome-platform.spec b/packages/SPECS/gnome-platform.spec
index 56be9ab..73307a8 100644
--- a/packages/SPECS/gnome-platform.spec
+++ b/packages/SPECS/gnome-platform.spec
@@ -73,8 +73,6 @@ Meta package for Gnome SDK dependencies
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Need empty machine-id to bind mount over
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/
 touch $RPM_BUILD_ROOT%{_sysconfdir}/machine-id
diff --git a/packages/SPECS/gnome-sdk.spec b/packages/SPECS/gnome-sdk.spec
index 2a0bdfc..909daf4 100644
--- a/packages/SPECS/gnome-sdk.spec
+++ b/packages/SPECS/gnome-sdk.spec
@@ -58,8 +58,6 @@ Meta package for Gnome SDK dependencies
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros
 
diff --git a/packages/SPECS/gnu-free-fonts.spec b/packages/SPECS/gnu-free-fonts.spec
index f4b7e04..95064f0 100644
--- a/packages/SPECS/gnu-free-fonts.spec
+++ b/packages/SPECS/gnu-free-fonts.spec
@@ -40,8 +40,6 @@ with which most of the glyphs used in LaTeX can be displayed.
 %build
 
 %install
-rm -rf %{buildroot}
-
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -p -m 644 *.ttf  %{buildroot}%{_fontdir}
 
diff --git a/packages/SPECS/google-crosextra-caladea-fonts.spec 
b/packages/SPECS/google-crosextra-caladea-fonts.spec
index 50602a3..78f142b 100644
--- a/packages/SPECS/google-crosextra-caladea-fonts.spec
+++ b/packages/SPECS/google-crosextra-caladea-fonts.spec
@@ -33,8 +33,6 @@ typeface family based on Lato.
 %build
 
 %install
-rm -rf %{buildroot}
-
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
diff --git a/packages/SPECS/google-crosextra-carlito-fonts.spec 
b/packages/SPECS/google-crosextra-carlito-fonts.spec
index 131e1e4..0741bee 100644
--- a/packages/SPECS/google-crosextra-carlito-fonts.spec
+++ b/packages/SPECS/google-crosextra-carlito-fonts.spec
@@ -33,8 +33,6 @@ coverage as Calibri. This font is sans-serif typeface family based on Lato.
 %build
 
 %install
-rm -rf %{buildroot}
-
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
diff --git a/packages/SPECS/gstreamer1-plugins-base.spec b/packages/SPECS/gstreamer1-plugins-base.spec
index 1470b47..f3e07a0 100644
--- a/packages/SPECS/gstreamer1-plugins-base.spec
+++ b/packages/SPECS/gstreamer1-plugins-base.spec
@@ -83,7 +83,6 @@ make %{?_smp_mflags} V=1
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang gst-plugins-base-%{majorminor}
diff --git a/packages/SPECS/gstreamer1.spec b/packages/SPECS/gstreamer1.spec
index 42e6caa..a82a6e3 100644
--- a/packages/SPECS/gstreamer1.spec
+++ b/packages/SPECS/gstreamer1.spec
@@ -62,7 +62,6 @@ make %{?_smp_mflags} V=1
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 # Remove rpath.
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstbase-1.0.so.*
diff --git a/packages/SPECS/hicolor-icon-theme.spec b/packages/SPECS/hicolor-icon-theme.spec
index 4c4d146..ab9088d 100644
--- a/packages/SPECS/hicolor-icon-theme.spec
+++ b/packages/SPECS/hicolor-icon-theme.spec
@@ -23,7 +23,6 @@ chmod 0644 COPYING
 %configure
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr install
 
 touch $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
diff --git a/packages/SPECS/hunspell-en.spec b/packages/SPECS/hunspell-en.spec
index 2e9645d..1df2efe 100644
--- a/packages/SPECS/hunspell-en.spec
+++ b/packages/SPECS/hunspell-en.spec
@@ -80,7 +80,6 @@ for i in README_en_CA.txt README_en_US.txt; do
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
 cp -p en_*.dic en_*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
 cd scowl/speller
diff --git a/packages/SPECS/hunspell.spec b/packages/SPECS/hunspell.spec
index a009f10..72c9a08 100644
--- a/packages/SPECS/hunspell.spec
+++ b/packages/SPECS/hunspell.spec
@@ -34,7 +34,6 @@ configureflags="--disable-rpath --disable-static --with-ui --with-readline"
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
diff --git a/packages/SPECS/libICE.spec b/packages/SPECS/libICE.spec
index fb0c5c0..582866f 100644
--- a/packages/SPECS/libICE.spec
+++ b/packages/SPECS/libICE.spec
@@ -33,8 +33,6 @@ autoreconf -v --install --force
 V=1 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libSM.spec b/packages/SPECS/libSM.spec
index a0702ba..39da1cb 100644
--- a/packages/SPECS/libSM.spec
+++ b/packages/SPECS/libSM.spec
@@ -35,8 +35,6 @@ autoreconf -v --install --force
 make %{_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libX11.spec b/packages/SPECS/libX11.spec
index ae8e521..dc13172 100644
--- a/packages/SPECS/libX11.spec
+++ b/packages/SPECS/libX11.spec
@@ -51,8 +51,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXau.spec b/packages/SPECS/libXau.spec
index a642251..9015d1a 100644
--- a/packages/SPECS/libXau.spec
+++ b/packages/SPECS/libXau.spec
@@ -39,8 +39,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXcomposite.spec b/packages/SPECS/libXcomposite.spec
index 7de3f88..a4e4907 100644
--- a/packages/SPECS/libXcomposite.spec
+++ b/packages/SPECS/libXcomposite.spec
@@ -34,7 +34,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
diff --git a/packages/SPECS/libXcursor.spec b/packages/SPECS/libXcursor.spec
index ae2c8fb..d5b922d 100644
--- a/packages/SPECS/libXcursor.spec
+++ b/packages/SPECS/libXcursor.spec
@@ -51,8 +51,6 @@ autoreconf -v --install --force
 make V=1 %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/default
diff --git a/packages/SPECS/libXdamage.spec b/packages/SPECS/libXdamage.spec
index 1ef8123..7a6cda2 100644
--- a/packages/SPECS/libXdamage.spec
+++ b/packages/SPECS/libXdamage.spec
@@ -33,8 +33,6 @@ autoreconf -v --install --force
 make V=1 %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXdmcp.spec b/packages/SPECS/libXdmcp.spec
index c08c086..47a0f98 100644
--- a/packages/SPECS/libXdmcp.spec
+++ b/packages/SPECS/libXdmcp.spec
@@ -32,8 +32,6 @@ autoreconf -v --install --force
 make V=1 %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXext.spec b/packages/SPECS/libXext.spec
index 7fb17c3..3299b92 100644
--- a/packages/SPECS/libXext.spec
+++ b/packages/SPECS/libXext.spec
@@ -36,8 +36,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXfixes.spec b/packages/SPECS/libXfixes.spec
index f3ff788..5168331 100644
--- a/packages/SPECS/libXfixes.spec
+++ b/packages/SPECS/libXfixes.spec
@@ -35,8 +35,6 @@ autoreconf -v --install --force
 make V=1 %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXft.spec b/packages/SPECS/libXft.spec
index 3debf19..364da94 100644
--- a/packages/SPECS/libXft.spec
+++ b/packages/SPECS/libXft.spec
@@ -37,8 +37,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags} 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: There's no real good reason to ship these anymore, as pkg-config
diff --git a/packages/SPECS/libXi.spec b/packages/SPECS/libXi.spec
index b478a62..e2a8a2e 100644
--- a/packages/SPECS/libXi.spec
+++ b/packages/SPECS/libXi.spec
@@ -46,8 +46,6 @@ autoreconf -v --install || exit 1
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXinerama.spec b/packages/SPECS/libXinerama.spec
index b588ff4..4bc701b 100644
--- a/packages/SPECS/libXinerama.spec
+++ b/packages/SPECS/libXinerama.spec
@@ -37,8 +37,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXpm.spec b/packages/SPECS/libXpm.spec
index e6d3b12..16db767 100644
--- a/packages/SPECS/libXpm.spec
+++ b/packages/SPECS/libXpm.spec
@@ -34,8 +34,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXrandr.spec b/packages/SPECS/libXrandr.spec
index 8178f92..970596f 100644
--- a/packages/SPECS/libXrandr.spec
+++ b/packages/SPECS/libXrandr.spec
@@ -37,8 +37,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
diff --git a/packages/SPECS/libXrender.spec b/packages/SPECS/libXrender.spec
index 4cebd88..896429e 100644
--- a/packages/SPECS/libXrender.spec
+++ b/packages/SPECS/libXrender.spec
@@ -34,8 +34,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 # undo this, we'll add it ourselves in %%doc
 rm $RPM_BUILD_ROOT/%{_docdir}/*/libXrender.txt
diff --git a/packages/SPECS/libXt.spec b/packages/SPECS/libXt.spec
index cc18682..d19303d 100644
--- a/packages/SPECS/libXt.spec
+++ b/packages/SPECS/libXt.spec
@@ -42,8 +42,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 V=1 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
diff --git a/packages/SPECS/libXtst.spec b/packages/SPECS/libXtst.spec
index f3946c8..e7a33ab 100644
--- a/packages/SPECS/libXtst.spec
+++ b/packages/SPECS/libXtst.spec
@@ -39,8 +39,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/libXv.spec b/packages/SPECS/libXv.spec
index 3981589..798207c 100644
--- a/packages/SPECS/libXv.spec
+++ b/packages/SPECS/libXv.spec
@@ -36,8 +36,6 @@ autoreconf -v --install --force
 make %{?_smp_mflags}
 
 %install
-
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/liberation-fonts.spec b/packages/SPECS/liberation-fonts.spec
index dfa671b..45525bd 100644
--- a/packages/SPECS/liberation-fonts.spec
+++ b/packages/SPECS/liberation-fonts.spec
@@ -46,9 +46,6 @@ New.
 %build
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
-
 # fonts .ttf
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
diff --git a/packages/SPECS/libpciaccess.spec b/packages/SPECS/libpciaccess.spec
index 5f264fc..f6bfd9b 100644
--- a/packages/SPECS/libpciaccess.spec
+++ b/packages/SPECS/libpciaccess.spec
@@ -37,7 +37,6 @@ autoreconf -v --install
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
diff --git a/packages/SPECS/libthai.spec b/packages/SPECS/libthai.spec
index b38ac0c..a515ed6 100644
--- a/packages/SPECS/libthai.spec
+++ b/packages/SPECS/libthai.spec
@@ -36,8 +36,6 @@ libthai.
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
 
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
diff --git a/packages/SPECS/libxcb.spec b/packages/SPECS/libxcb.spec
index 27706f5..40409ce 100644
--- a/packages/SPECS/libxcb.spec
+++ b/packages/SPECS/libxcb.spec
@@ -54,7 +54,6 @@ autoreconf -v --install
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -pm 644 COPYING NEWS README $RPM_BUILD_ROOT%{_pkgdocdir}
 sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefix},' %{SOURCE1} > 
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
diff --git a/packages/SPECS/libxkbfile.spec b/packages/SPECS/libxkbfile.spec
index d60aed7..b69ea20 100644
--- a/packages/SPECS/libxkbfile.spec
+++ b/packages/SPECS/libxkbfile.spec
@@ -34,8 +34,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
diff --git a/packages/SPECS/llvm.spec b/packages/SPECS/llvm.spec
index ceae305..f86bae7 100644
--- a/packages/SPECS/llvm.spec
+++ b/packages/SPECS/llvm.spec
@@ -115,8 +115,6 @@ make %{?_smp_mflags} REQUIRES_RTTI=1 VERBOSE=1
 #make REQUIRES_RTTI=1 VERBOSE=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=%{buildroot} PROJ_docsdir=/moredocs
 
 # you have got to be kidding me
diff --git a/packages/SPECS/mesa.spec b/packages/SPECS/mesa.spec
index 1082e9d..b5e1b99 100644
--- a/packages/SPECS/mesa.spec
+++ b/packages/SPECS/mesa.spec
@@ -174,8 +174,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
 make %{?_smp_mflags} MKDEP=/bin/true
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We moved everything into a GL subdir to allow easy override
diff --git a/packages/SPECS/wayland.spec b/packages/SPECS/wayland.spec
index e297d6a..7ed2d18 100644
--- a/packages/SPECS/wayland.spec
+++ b/packages/SPECS/wayland.spec
@@ -75,7 +75,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
diff --git a/packages/SPECS/xcb-proto.spec b/packages/SPECS/xcb-proto.spec
index 3f21571..c7ea47f 100644
--- a/packages/SPECS/xcb-proto.spec
+++ b/packages/SPECS/xcb-proto.spec
@@ -29,7 +29,6 @@ the protocol.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]