update build system

Author: lyonel

.version

@@ -1,10 +1,18 @@
 PACKAGENAME = lshw
+VERSION?= $(shell git describe --tags --long | cut -d - -f 1,2 | tr - .)
 export PACKAGENAME
 
-all clean release install snapshot gui install-gui:
+all clean install snapshot gui install-gui:
 	+$(MAKE) -C src $@
 
 version.cpe: .version
 	echo -n cpe:/a:ezix:$(PACKAGENAME): > $@
 	cat $^ >> $@
 
+$(PACKAGENAME).spec: $(PACKAGENAME).spec.in
+	cat $^ | sed -e s/\@VERSION\@/$(VERSION)/g > $@
+
+release: $(PACKAGENAME).spec
+	git archive --prefix=$(PACKAGENAME)-$(VERSION)/ -o $(PACKAGENAME)-$(VERSION).tar HEAD
+	tar -rf $(PACKAGENAME)-$(VERSION).tar $^
+	gzip -f $(PACKAGENAME)-$(VERSION).tar

Makefile

@@ -94,7 +94,7 @@ http://lshw.ezix.org/
 
 %files
 %defattr(-,root,root, 0555)
-%doc README COPYING docs/TODO docs/Changelog docs/lshw.xsd
+%doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd
 %{_sbindir}/lshw
 %doc %{_mandir}/man?/*
 %{_datadir}/lshw/

src/lshw.spec.in renamed to lshw.spec.in

@@ -1,6 +1,6 @@
 PACKAGENAME:=lshw
 export PACKAGENAME
-SNAPSHOT=0.$(shell cat .timestamp)
+VERSION?= $(shell git describe --tags --long | cut -d - -f 1,2 | tr - .)
 
 SQLITE?=0
 
@@ -115,30 +115,6 @@ clean:
 	make -C core clean
 	make -C gui clean
 
-.timestamp:
-	date --utc +%Y%m%d%H%M%S > $@
-
-$(PACKAGENAME).spec: $(PACKAGENAME).spec.in
-	cat $^ | sed -e "s/\@VERSION\@/`cat ../.version`/g" > $@
-                                                                               
-release: $(PACKAGENAME).spec
-	mkdir -p ../../releases
-	svn copy ${PWD} `dirname ${PWD}`/releases/`cat ../.version`
-	svn commit `dirname ${PWD}`/releases/`cat ../.version` -m "released version "`cat ../.version`" of "$(PACKAGENAME)
-	rm -rf $(PACKAGENAME)-`cat ../.version`
-	svn export ../../releases/`cat ../.version` $(PACKAGENAME)-`cat ../.version`
-	cp $^ $(PACKAGENAME)-`cat ../.version`/$(PACKAGENAME).spec
-	tar cfz $(PACKAGENAME)-`cat ../.version`.tar.gz --owner=0 --group=0 --numeric-owner --mode="go-w" $(PACKAGENAME)-`cat ../.version`
-	rm -rf $(PACKAGENAME)-`cat ../.version`
-
-snapshot: .timestamp
-	rm -rf $(PACKAGENAME)-$(SNAPSHOT)
-	svn export -r HEAD .. $(PACKAGENAME)-$(SNAPSHOT)
-	cat $(PACKAGENAME)-$(SNAPSHOT)/src/$(PACKAGENAME).spec.in | sed -e "s/\@VERSION\@/$(SNAPSHOT)/g" > $(PACKAGENAME)-$(SNAPSHOT)/$(PACKAGENAME).spec
-	tar cfz $(PACKAGENAME)-$(SNAPSHOT).tar.gz --owner=0 --group=0 --numeric-owner --mode="go-w" $(PACKAGENAME)-$(SNAPSHOT)
-	rm -rf $(PACKAGENAME)-$(SNAPSHOT)
-	rm -f .timestamp
-
 depend:
 	@makedepend -Y $(SRCS) 2> /dev/null > /dev/null