- split rpm generation from software, cleanup, svn adaptation

1 files changed, 7 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index a8321c1..d03e59a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 PACKAGE = msec
-VERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec|head -1)
-RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec|head -1)
-TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
+VERSION:=0.50.0
 
 all: promisc_check msec_find python
 	make -C cron-sh
@@ -45,15 +43,6 @@ install:
 	    install -m 644 $$i/*.8 $(RPM_BUILD_ROOT)/usr/share/man/`basename $$i`/man8 ; \
 	done	
 
-version:
-	@echo $(VERSION)-$(RELEASE)
-
-# rules to build a test rpm
-
-localsrpm: clean localdist buildsrpm
-
-localrpm: clean localdist buildrpm
-
 localdist: cleandist dir localcopy tar
 
 cleandist:
@@ -66,30 +55,16 @@ localcopy: clean
 	find . -not -name "$(PACKAGE)-$(VERSION)" -a -not -name '*.bz2'|cpio -pd $(PACKAGE)-$(VERSION)/
 	find $(PACKAGE)-$(VERSION) -type d -name CVS|xargs rm -rf 
 
-tar:
+tar: export
 	tar cvf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION)
 	bzip2 -9vf $(PACKAGE)-$(VERSION).tar
 	rm -rf $(PACKAGE)-$(VERSION)
 
-buildsrpm:
-	rpm -ts $(PACKAGE)-$(VERSION).tar.bz2
-
-buildrpm:
-	rpm -ta --clean $(PACKAGE)-$(VERSION).tar.bz2
-
-# rules to build a distributable rpm
-
-rpm: changelog cvstag dist buildrpm
-
 dist: cleandist dir export tar
 
-export:
-	cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE)
+changelog: 
+	svn2cl -o ChangeLog || : 
 
-cvstag:
-	cvs tag $(CVSTAGOPT) $(TAG)
-
-changelog: ../common/username
-	cvs2cl -U ../common/username -I ChangeLog 
-	rm -f ChangeLog.bak
-	cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog
+export:
+	rm -fr $(PACKAGE)-$(VERSION)
+	svn export `svn info | grep '^URL' | sed 's/URL : //'` $(PACKAGE)-$(VERSION)