From f6e711e44dbb883790bdf6a566aa4628e488e14c Mon Sep 17 00:00:00 2001
From: Chmouel Boudjnah <chmouel@mandriva.org>
Date: Wed, 8 Dec 1999 02:49:28 +0000
Subject: "See_The_Changelog"

---
 ChangeLog |  4 +++-
 Makefile  |  6 ++++--
 msec.spec | 28 ++++++++++++----------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7dc059..dd1b572 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@
 	* Makefile (rpm): target for rpm.
 	(dis): Add a make dis to easy switch from cvs to dis.
 
-	* doc/msec.spec: use bzip2 sources, clean up %install to use Makefile.
+	* msec.spec: use bzip2 sources, clean up %install to use Makefile.
+	move msec.spec on the top to allow rpm -ta (in fact rpm -ta don't
+	support currently bzip2 sources)
 
 	* cron-sh/promisc_check.sh (LogPromisc): add a missing quote.
 
diff --git a/Makefile b/Makefile
index 11984a5..35d9da0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ clean:
 promisc_check: 
 	(cd src/promisc_check; make)
 
-rpm: all
+rpm_install: all
 	rm -rf $(RPM_BUILD_ROOT)
 	mkdir -p $(RPM_BUILD_ROOT)/etc/security/msec/{init-sh,cron-sh}/
 	mkdir -p $(RPM_BUILD_ROOT)/usr/bin
@@ -32,8 +32,10 @@ dis: clean
 	mkdir -p msec-$(VERSION)
 	find . -not -name "msec-$(VERSION)"|cpio -pd msec-$(VERSION)/
 	find msec-$(VERSION) -type d -name CVS|xargs rm -rf 
+	perl -p -i -e 's|^%define version.*|%define version $(VERSION)|' msec.spec
 	tar cf ../msec-$(VERSION).tar msec-$(VERSION)
-	bzip2 ../msec-$(VERSION).tar
+	bzip2 -9f ../msec-$(VERSION).tar
+	rm -rf msec-$(VERSION)
 
 install:
 	(rm -rf /etc/security/msec)
diff --git a/msec.spec b/msec.spec
index ed9eb3b..2759220 100644
--- a/msec.spec
+++ b/msec.spec
@@ -1,7 +1,7 @@
 Summary: Security Level & Program for the Linux Mandrake distribution
 Name: msec
 Version: 0.5
-Release: 1mdk
+Release: 3mdk
 Source: msec-0.5.tar.bz2
 Copyright: GPL
 Group: System Environment/Base
@@ -23,31 +23,27 @@ in order to test the security of your system and alert you if needed.
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
-mkdir -p $RPM_BUILD_ROOT/etc/security/msec/init-sh
-mkdir -p $RPM_BUILD_ROOT/etc/security/msec/cron-sh
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-
-cp init-sh/level*.sh $RPM_BUILD_ROOT/etc/security/msec/init-sh
-cp init-sh/lib.sh $RPM_BUILD_ROOT/etc/security/msec/init-sh
-cp init-sh/init.sh $RPM_BUILD_ROOT/etc/security/msec
-cp init-sh/file_perm.sh $RPM_BUILD_ROOT/etc/security/msec/init-sh
-cp init-sh/perm.[1-5] $RPM_BUILD_ROOT/etc/security/msec/init-sh
-cp init-sh/server.* $RPM_BUILD_ROOT/etc/security/msec/init-sh
-cp init-sh/grpuser $RPM_BUILD_ROOT/etc/security/msec/init-sh
-cp init-sh/custom.sh $RPM_BUILD_ROOT/etc/security/msec/init-sh
-cp cron-sh/*.sh $RPM_BUILD_ROOT/etc/security/msec/cron-sh
-touch $RPM_BUILD_ROOT/etc/security/msec/security.conf
-cp src/promisc_check/promisc_check $RPM_BUILD_ROOT/usr/bin
+make rpm_install RPM_BUILD_ROOT=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING Makefile README doc/*txt ChangeLog
 /etc/security/msec
 /usr/bin/promisc_check
 
 %changelog
+* Wed Dec  8 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- Various (Makefile|specfiles) clean-up.
+- insert doc.
+
+* Wed Dec  8 1999 Pixel <pixel@linux-mandrake.com>
+- fixed a yoyosuk in promisc_check cron (have to teach him how to use an editor!)
+- source in .bz2 (yoyosuk2)
+- strip binary (yoyosuk3)
+
 * Mon Dec  6 1999 Yoann Vandoorselaere <yoann@mandrakesoft.com>
 - Released 0.5
 - Divided security check into 2 files :
-- 
cgit v1.2.1