From 56aae6038bf4d98b791ce839b5776edea568084e Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Sat, 15 Feb 2003 07:26:53 +0000
Subject: [PATCH] This removes any existing stuff under tmp/gbootroot in the
 specs if it exists, which can creates nasties when a build fails at -bl, and
 removed modules/CVS filter from gbootroot_pkg which didn't effect 7.3 or
 Mandrake 9.0, but did effect 8.0, now have to check whether this is working
 properly on Debian again.  Not sure why these directories were causing a
 problem to begin with.

---
 gbootroot_pkg              | 3 ---
 pkg/rpm/gbootroot-mdk.spec | 5 ++++-
 pkg/rpm/gbootroot.spec     | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gbootroot_pkg b/gbootroot_pkg
index 7ed1ad2..ae17898 100755
--- a/gbootroot_pkg
+++ b/gbootroot_pkg
@@ -415,9 +415,6 @@ if ( $ARGV[0] eq "both" || $ARGV[0] eq "rpm" ) {
 
         "/usr/share/doc-base/gbootroot\n", 1,
         "/usr/lib/menu/gbootroot\n", 1, 
-        "/usr/lib/bootroot/yard/Replacements/lib/modules/CVS/Root\n", 1, 
-        "/usr/lib/bootroot/yard/Replacements/lib/modules/CVS/Repository\n", 1, 
-        "/usr/lib/bootroot/yard/Replacements/lib/modules/CVS/Entries\n", 1, 
         "/usr/share/doc/gbootroot/Changes.gz\n", 1, 
         "/usr/share/doc/gbootroot/copyright\n", 1, 
         "/usr/share/doc/gbootroot/changelog.Debian.gz\n", 1,
diff --git a/pkg/rpm/gbootroot-mdk.spec b/pkg/rpm/gbootroot-mdk.spec
index 1a9d885..f3ddb72 100644
--- a/pkg/rpm/gbootroot-mdk.spec
+++ b/pkg/rpm/gbootroot-mdk.spec
@@ -91,7 +91,10 @@ as mdk.
 %prep
 %setup -n gbootroot-%{version}
 #chown -R root:root .
-if [ ! -e /tmp/gbootroot ] ; then
+if [ -e /tmp/gbootroot ] ; then
+    rm -rf /tmp/gbootroot;
+    mkdir /tmp/gbootroot;
+elif [ ! -e /tmp/gbootroot ] ; then
     mkdir /tmp/gbootroot;
 fi;
 install -d $HOME/gbootroot/RPMS/i386
diff --git a/pkg/rpm/gbootroot.spec b/pkg/rpm/gbootroot.spec
index f693f81..cbfc5e1 100644
--- a/pkg/rpm/gbootroot.spec
+++ b/pkg/rpm/gbootroot.spec
@@ -89,7 +89,10 @@ as mdk.
 %prep
 %setup -n gbootroot-%{version}
 #chown -R root:root .
-if [ ! -e /tmp/gbootroot ] ; then
+if [ -e /tmp/gbootroot ] ; then
+    rm -rf /tmp/gbootroot;
+    mkdir /tmp/gbootroot;
+elif [ ! -e /tmp/gbootroot ] ; then
     mkdir /tmp/gbootroot;
 fi;
 install -d $HOME/gbootroot/RPMS/i386