X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=ad95581acbe4f7b5974d8fc27b28a36d031c7273;hb=006f2e118a602a9b06222647b53b5f7680b5907a;hp=d4ccf47e90781eefac4073b72dbd822abc6960be;hpb=5d0f2ee2524724a97c0b8505fe784a8da9b12c6d;p=build.git

diff --git a/Makefile b/Makefile
index d4ccf47e..ad95581a 100644
--- a/Makefile
+++ b/Makefile
@@ -348,7 +348,7 @@ header.spec:
 	echo "%global _source_filedigest_algorithm 1" >> $@
 	echo "%global _source_payload       w9.gzdio" >> $@
 	echo "%global _binary_payload       w9.gzdio" >> $@
-ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33)"
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33 f35 f37)"
 	echo "%define debug_package %{nil}" >> $@
 endif
 
@@ -392,9 +392,7 @@ endef
 #   $(1)/ gets cleaned up if job cannot be done
 define fetch_git_module
 	mkdir $(1) ; \
-	(git archive --remote=$($(1).gitrepo) $($(1).gittag) | tar -C $(1) -xf - ) || \
-	(echo "==================== git archive FAILED, trying git clone instead" ; \
-         git clone $($(1).gitrepo) $(1); cd $(1) ; git checkout $($(1).gittag) ; rm -rf .git ) || \
+	( git clone $($(1).gitrepo) $(1); cd $(1) ; git checkout $($(1).gittag) ; rm -rf .git ) || \
 	{ rm -rf $(1); false; }
 endef
 
@@ -452,8 +450,8 @@ endif
 ### this utility allows to extract various info from a spec file
 ### and to define them in makefiles
 # use the C code where it works as it's the original one, use the python code otherwise
-spec2make: spec2make.c
-	$(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt || ln -s spec2make.py $@
+spec2make:	spec2make.py
+	ln -s spec2make.py $@
 
 ### run spec2make on the spec file and include the result
 # usage: spec2make package
@@ -511,6 +509,9 @@ tarballs: $(ALLTARBALLS)
 	@echo $(words $(ALLTARBALLS)) source tarballs OK
 .PHONY: tarballs
 
+SOURCES/%.tar.xz: SOURCES/%
+	tar chpJf $@ -C SOURCES $*
+
 SOURCES/%.tar.bz2: SOURCES/%
 	tar chpjf $@ -C SOURCES $*