summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 9bd42bb4..fbfcc33c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ VERSION := $(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec | head
RELEASE := $(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec | head -1)
TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
+SVN_URL := $(shell svn info | grep ^URL: | cut -f2 -d\ )
+SVN_BASE := $(shell svn info | sed -n '/^URL: \(.*\/$(PACKAGE)\).*/s//\1/p')
+
FILES = AUTHORS ChangeLog Makefile Makefile.config convert ldetect-lst.spec lst update-ldetect-lst
.PHONY: changelog log
@@ -53,7 +56,7 @@ buildrpm:
# rules to build a distributable rpm
-srpm: check changelog cvstag dist
+srpm: check changelog svntag dist
rpm -ts $(PACKAGE)-$(VERSION).tar.bz2
rpm: srpm buildrpm
@@ -61,14 +64,14 @@ rpm: srpm buildrpm
dist: cleandist dir export tar
export:
- cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE)
+ @echo svn co $(SVN_BASE)/tags/$(TAG) $(PACKAGE)-$(VERSION)
-cvstag:
- cvs tag $(CVSTAGOPT) $(TAG)
+svntag:
+ @echo svn cp -m "tagged as $(TAG)" $(SVNTAGOPT) $(SVN_URL) $(SVN_BASE)/tags/$(TAG)
log: changelog
-changelog: ../common/username
+changelog: ../common/username.xml
svn2cl --authors ../common/username.xml --accum
rm -f ChangeLog.bak
svn commit -m "Generated by cvs2cl the `LC_TIME=C date '+%d_%b'`" ChangeLog