summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile6
-rw-r--r--bashrc2
-rw-r--r--rootfiles.spec8
4 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ee42daf..04c6751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-2000-03-22 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-03-23 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+
+ * bashrc: cleanup.
+2000-03-22 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+ * zshrc: remove file.
* emacs: remove the files.
1999-12-28 Chmouel Boudjnah <chmouel@mandrakesoft.com>
-
* : first import.
diff --git a/Makefile b/Makefile
index 26e9d76..c734593 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
NAME = rootfiles
-VERSION = 7.0
-DOTFILES = Xdefaults bash_logout bash_profile bashrc cshrc kderc tcshrc vimrc zshrc kde netscape
+VERSION=$(shell awk '/define version/ { print $$3 }' $(NAME).spec)
+DOTFILES = Xdefaults bash_logout bash_profile bashrc cshrc kderc tcshrc vimrc kde netscape
FILES = Desktop
all:
@@ -13,11 +13,11 @@ install:
install -d -m700 $(RPM_BUILD_ROOT)/root/tmp
dis:
+ cvs commit
rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
mkdir -p $(NAME)-$(VERSION)
find . -not -name "$(NAME)-$(VERSION)"|cpio -pd $(NAME)-$(VERSION)/
find $(NAME)-$(VERSION) -type d -name CVS -o -name .cvsignore -o -name unused |xargs rm -rf
- perl -p -i -e 's|^%define version.*|%define version $(VERSION)|' $(NAME).spec
tar cf ../$(NAME)-$(VERSION).tar $(NAME)-$(VERSION)
bzip2 -9f ../$(NAME)-$(VERSION).tar
rm -rf $(NAME)-$(VERSION)
diff --git a/bashrc b/bashrc
index 142b4c9..018f569 100644
--- a/bashrc
+++ b/bashrc
@@ -10,8 +10,6 @@ alias d='ls'
alias s='cd ..'
alias p='cd -'
-echo $PATH|grep -q /sbin || export PATH=$PATH:/sbin:/usr/sbin
-
# Tell to df to don't see the supermount filesystems.
alias df='df -x supermount'
diff --git a/rootfiles.spec b/rootfiles.spec
index 8e1b7c3..003c489 100644
--- a/rootfiles.spec
+++ b/rootfiles.spec
@@ -1,5 +1,5 @@
-%define version 7.1
-%define release 1mdk
+%define version 7.0
+%define release 2mdk
%define name rootfiles
Summary: The basic required files for the root user's directory.
@@ -47,8 +47,12 @@ fi
%attr(0700,root,root) /root/tmp/
%changelog
+* Thu Mar 23 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 7.0-2mdk
+- bashrc: cleanup.
+
* Wed Mar 22 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 7.1-1mdk
- Remove .emacs (moved to his package).
+- Remove .zshrc (moved to his package).
* Mon Jan 10 2000 Pixel <pixel@mandrakesoft.com>
- added a kfmrc (for Templates directory)