2.24 Fix how the tarball is build

4 files changed, 9 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 32920c6..883a13a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE = mageiawelcome
-VERSION = 2.23
+VERSION = 2.24
 GITPATH = git://git.mageia.org/software/mageiawelcome
 
 TEXT_FILES = Makefile
@@ -25,16 +25,9 @@ cleandist: clean
 install: version
 	make -C po DESTDIR=$(RPM_BUILD_ROOT)/usr install
 
-dir:
-	mkdir $(PACKAGE)-$(VERSION)
-
 dist: tar
 
-localcopy: dir
-	tar c --exclude=.git $(FILES) | tar x -C $(PACKAGE)-$(VERSION)
-
-tar: localcopy
-	tar cvYf $(PACKAGE)-$(VERSION).tar.xz $(PACKAGE)-$(VERSION)
-	rm -fr $(PACKAGE)-$(VERSION)
+tar: 
+	git archive --prefix $(PACKAGE)-$(VERSION)/ $(VERSION) | xz -9 > $(PACKAGE)-$(VERSION).tar.xz
 
-dist: cleandist version dir localcopy tar
+dist: cleandist version tar
diff --git a/NEWS b/NEWS
index 37e7068..0c62f23 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+2.24
+    Fix method for building the terball, using git instead of local copy
+
 2.23
     Remove translation en_GB, not useful and with errors in links
     Add dist option in makefile
diff --git a/qml/Version.qml b/qml/Version.qml
index 1a6a542..5f9f9a1 100644
--- a/qml/Version.qml
+++ b/qml/Version.qml
@@ -1,2 +1,2 @@
 import QtQuick 2.0
-Item { property var version: '2.23';}
+Item { property var version: '2.24';}
diff --git a/version.py b/version.py
index 8b7f50f..fd815ab 100644
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-version='2.23'
+version='2.24'