X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=333189185823c550be156c0ae13a5cb280efbbe4;hb=4a4544bae4f7961f76cc84b1748493af41bc2f15;hp=d8cfefc7b1df52fb2780cc3e449af25d90b8d042;hpb=a812820d19b31a5719a3b30e7ba4dac5f8d7170c;p=build.git diff --git a/Makefile b/Makefile index d8cfefc7..33318918 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)" +ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33 f35)" 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 $*