new makefile with changes for svn

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@10 ef72aa8b-4018-0410-8976-d6e080ef94d8

1 files changed, 8 insertions, 11 deletions

diff --git a/src/Makefile b/src/Makefile
index e6387672..6c2b3a52 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,26 +5,23 @@
 NAME    = sos
 VERSION = $(shell awk '/define version/ { print $$3 }' sos.spec)
 RELEASE = $(shell awk '/define release/ { print $$3 }' sos.spec)
-CVSTAG  = r$(subst .,-,$(VERSION)-$(RELEASE))
+REPO = https://sos.108.redhat.com/svn/sos
+SVNTAG  = r$(subst .,-,$(VERSION)-$(RELEASE))
 CVSROOT = $(shell cat CVS/Root)
 
 
 all:
 
-changelog:
-	@rcs2log | sed "s|@.*redhat\.com|@redhat.com|" | sed "s|@.*redhat\.de|@redhat.com|" | sed "s|@redhat\.de|@redhat.com|" | sed "s|@@|@|" | \
-	sed "s|/usr/local/CVS/$(NAME)/||g" | sed "s|/cvs/rhl/$(NAME)/||g" > changenew
-	mv ChangeLog ChangeLog.old
-	cat changenew ChangeLog.old > ChangeLog
-	rm -f changenew
-
 tag-archive:
-	@cvs -Q tag -F $(CVSTAG)
-	echo "$(CVSTAG)"
+	@svn copy $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG) \
+	-m "Tagging the $(SVNTAG) release of the sos project"
+	@echo "$(SVNTAG)"
 
 create-archive: tag-archive
+create-archive:
 	@rm -rf /tmp/$(NAME)
-	@cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(NAME) || echo GRRRrrrrr -- ignore [export aborted]
+	@svn export $(REPO)/tags/$(SVNTAG)/src /tmp/$(NAME) \
+	 || echo GRRRrrrrr -- ignore [export aborted]
 	@mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION)
 	@cd /tmp; tar --bzip2 -cSpf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
 	@rm -rf /tmp/$(NAME)-$(VERSION)