From 3d812c4ec94e15b9141ce3d383e7cb2d7734c293 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 13 Mar 2001 15:51:53 +0000
Subject: vimrc: remove "Default tab for 4" (set ts=4)

---
 ChangeLog      |  4 ++++
 rootfiles.spec | 25 ++++++++++++++-----------
 vimrc          |  3 ---
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90e0451..575b5a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-31  Pixel  <pixel@mandrakesoft.com>
+
+	* vimrc: remove "Default tab for 4" (set ts=4)
+
 2000-03-05  Pablo Saratxaga  <pablo@mandrakesoft.com>
 
 	* bashrc: sourcing of color ls should be done also for X11
diff --git a/rootfiles.spec b/rootfiles.spec
index 6bb9812..b6bc86e 100644
--- a/rootfiles.spec
+++ b/rootfiles.spec
@@ -1,5 +1,5 @@
 %define version 7.2
-%define release 1mdk
+%define release 2mdk
 %define name rootfiles
 
 Summary: The basic required files for the root user's directory.
@@ -29,16 +29,16 @@ make install RPM_BUILD_ROOT=$RPM_BUILD_ROOT/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-# we used to put .Xclients in this package -- back it up if it's been
-# customized
-cd /root
-if [ -f .Xclients -a -x /bin/awk ]; then
-    m=`md5sum .Xclients | awk '{ print $1 }'`
-    if [ $m != "506b9496f2853fc9fee6c6b1c5f3ee48" ]; then
-	mv .Xclients .Xclients.rpmsave
-    fi
-fi
+#%pre
+## we used to put .Xclients in this package -- back it up if it's been
+## customized
+#cd /root
+#if [ -f .Xclients -a -x /bin/awk ]; then
+#    m=`md5sum .Xclients | awk '{ print $1 }'`
+#    if [ $m != "506b9496f2853fc9fee6c6b1c5f3ee48" ]; then
+#	 mv .Xclients .Xclients.rpmsave
+#    fi
+#fi
 
 %files
 %defattr(-,root,root)
@@ -48,6 +48,9 @@ fi
 %attr(0700,root,root) /root/tmp/
 
 %changelog
+* Tue Mar 13 2001 Pixel <pixel@mandrakesoft.com> 7.2-2mdk
+- vimrc: remove "Default tab for 4" (set ts=4)
+
 * Mon Oct  9 2000 Guillaume Cottenceau <gc@mandrakesoft.com> 7.2-1mdk
 - rebuild for 7.2
 
diff --git a/vimrc b/vimrc
index 101d854..96e2d24 100644
--- a/vimrc
+++ b/vimrc
@@ -21,9 +21,6 @@ map <F5> :bp<C-M>
 map <F6> :bn<C-M>
 map <F7> :bd<C-M>
 
-"Default tab for 4
-set ts=4
-
 "Default backspace like normal
 set bs=2
 
-- 
cgit v1.2.1