Makefile: adjust PyPI packaging/upload

Since we favor the creation of a tarball with "git archive", PyPI gets
sensitive every now and then with our uploads.  Since the 42.0
release, pushing the new packages to PyPI would result in Server
Errors.

This adds the PKG-INFO to the tarball that will be uploaded, which
seems to fix the current errors.  Also, since it's now a single file,
it can be pushed with the "twine" command line application.

Alternatively, we could double check our file manifest, and rely
entirely on setuptools to generate the tarball.  But, I'm not a big
fan of adding files to version control, and then to a manifest of any
sort.

Note: in the past, this was also necessary because of the tweaks to
the information inside the PKG-INFO file, namely the package name
(avocado -> avocado-framework).
Signed-off-by: NCleber Rosa <crosa@redhat.com>

Makefile

@@ -67,15 +67,23 @@ source-release: clean
 
 source-pypi: clean
 	if test ! -d PYPI_UPLOAD; then mkdir PYPI_UPLOAD; fi
-	git archive --prefix="avocado-framework/" -o "PYPI_UPLOAD/avocado-framework-$(VERSION).tar.gz" $(VERSION)
+	git archive --format="tar" --prefix="avocado-framework/" -o "PYPI_UPLOAD/avocado-framework-$(VERSION).tar" $(VERSION)
 
 pypi: source-pypi develop
-	cp avocado_framework.egg-info/PKG-INFO PYPI_UPLOAD/PKG-INFO
+	mkdir PYPI_UPLOAD/avocado-framework
+	cp avocado_framework.egg-info/PKG-INFO PYPI_UPLOAD/avocado-framework
+	tar rf "PYPI_UPLOAD/avocado-framework-$(VERSION).tar" -C PYPI_UPLOAD avocado-framework/PKG-INFO
+	gzip -9 "PYPI_UPLOAD/avocado-framework-$(VERSION).tar"
+	rm -f PYPI_UPLOAD/avocado-framework/PKG-INFO
+	rmdir PYPI_UPLOAD/avocado-framework
 	@echo
 	@echo "Please use the files on PYPI_UPLOAD dir to upload a new version to PyPI"
 	@echo "The URL to do that may be a bit tricky to find, so here it is:"
 	@echo " https://pypi.python.org/pypi?%3Aaction=submit_form"
 	@echo
+	@echo "Alternatively, you can also run: "
+	@echo " twine upload -u <PYPI_USERNAME> PYPI_UPLOAD/avocado-framework-$(VERSION).tar.gz"
+	@echo
 
 install:
 	$(PYTHON) setup.py install --root $(DESTDIR) $(COMPILE)