diff --git a/.packit.yaml b/.packit.yaml index 0ab868da88..eda2d27b20 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,12 +5,12 @@ synced_files: upstream_project_name: tmt downstream_package_name: tmt -current_version_command: ["make", "packit-version"] actions: create-archive: - - make packit-tarball - - make packit-path + - make tarball + get-current-version: + - make version jobs: - job: tests diff --git a/Makefile b/Makefile index ce23cd133d..bbbb0f5371 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ man: source rst2man $(TMP)/man.rst > $(TMP)/$(PACKAGE)/tmt.1 -# RPM packaging +# RPM packaging and Packit source: clean tmp mkdir -p $(TMP)/SOURCES mkdir -p $(TMP)/$(PACKAGE) @@ -43,6 +43,9 @@ source: clean tmp rm $(TMP)/$(PACKAGE)/tmt/steps/provision/{base,vagrant}.py tarball: source man cd $(TMP) && tar cfz SOURCES/$(PACKAGE).tar.gz $(PACKAGE) + @echo ./tmp/SOURCES/$(PACKAGE).tar.gz +version: + @echo "$(VERSION)" rpm: tarball rpmbuild --define '_topdir $(TMP)' -bb tmt.spec srpm: tarball @@ -50,15 +53,6 @@ srpm: tarball packages: rpm srpm -# Packit stuff -packit-tarball: tarball - mv $(TMP)/SOURCES/$(PACKAGE).tar.gz . -packit-path: - @printf "$(PACKAGE).tar.gz" -packit-version: - @printf "$(VERSION)" - - # Python packaging wheel: python setup.py bdist_wheel