diff --git a/.gitignore b/.gitignore index 1a88be8..965ca20 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ /1.tar.gz +/2.tar.gz +/3.tar.gz +/4.tar.gz +/5.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..2045f18 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,37 @@ +# we have the specfile in the root of our repository +specfile_path: osbuild.spec +# when doing an update in Fedora, we want to copy the spec file and the config file +synced_files: + - osbuild.spec + - .packit.yaml +upstream_project_name: osbuild +downstream_package_name: osbuild +jobs: + # trigger a COPR build for push events in open PRs + - job: copr_build + trigger: pull_request + metadata: + targets: + - fedora-30-x86_64 + - fedora-31-x86_64 + - fedora-rawhide-x86_64 + # this is triggered by a commit on src.fedoraproject.org, not Github! + # e.g. in case of mass rebuild or automated changes of spec file (e.g. Python packagers) + # it will create a PR on Github with changes in synchronized files + - job: sync_from_downstream + trigger: commit + # create a PR on src.fedoraproject.org containing updated spec file and new sources (tarball) + # triggered by Github release + - job: propose_downstream + trigger: release + metadata: + dist-git-branch: master + # The same as above only for f31 + - job: propose_downstream + trigger: release + metadata: + dist-git-branch: f31 + - job: propose_downstream + trigger: release + metadata: + dist-git-branch: f30 diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..c3065d4 --- /dev/null +++ b/README.packit @@ -0,0 +1,2 @@ +This repository is maintained by packit. +https://packit.dev/ diff --git a/osbuild.spec b/osbuild.spec index f2ff748..404a289 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,8 +1,9 @@ %global pypi_name osbuild +%global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 1 -Release: 2%{?dist} +Version: 5 +Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/osbuild/osbuild @@ -47,13 +48,13 @@ A build system for OS images %install %py3_install -mkdir -p %{buildroot}%{_libexecdir}/%{pypi_name}/stages -install -p -m 0755 $(find stages -type f) %{buildroot}%{_libexecdir}/%{pypi_name}/stages/ +mkdir -p %{buildroot}%{pkgdir}/stages +install -p -m 0755 $(find stages -type f) %{buildroot}%{pkgdir}/stages/ -mkdir -p %{buildroot}%{_libexecdir}/%{pypi_name}/assemblers -install -p -m 0755 $(find assemblers -type f) %{buildroot}%{_libexecdir}/%{pypi_name}/assemblers/ +mkdir -p %{buildroot}%{pkgdir}/assemblers +install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/ -install -p -m 0755 osbuild-run %{buildroot}%{_libexecdir}/%{pypi_name}/ +install -p -m 0755 osbuild-run %{buildroot}%{pkgdir}/ %check exit 0 @@ -63,7 +64,7 @@ exit 0 %files %license LICENSE %{_bindir}/osbuild -%{_libexecdir}/%{pypi_name} +%{pkgdir} %files -n python3-%{pypi_name} %license LICENSE @@ -72,6 +73,18 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Wed Oct 30 2019 Lars Karlitski - 5-1 +- new upstream release: 5 + +* Wed Oct 16 2019 Tom Gundersen - 4-1 +- new upstream release: 4 + +* Fri Oct 04 2019 Lars Karlitski - 3-1 +- new upstream release: 3 + +* Wed Sep 18 2019 Martin Sehnoutka - 2-1 +- new upstream release: 2 + * Mon Jul 29 2019 Martin Sehnoutka - 1-2 - update upstream URL to the new Github organization diff --git a/sources b/sources index 0fac90d..43c3172 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (1.tar.gz) = 24339d7d121f01f18a21a026dd495555b119b4c5f7a4d80b7c0a94392bbadcc21cc92439f0035faf39d7fb3921e17d85676db9ff4683be22255b9cd9844b1f2b +SHA512 (5.tar.gz) = 95cafa010f8f223a568ece8bb331fcbcbef350a87922965c97cdcd9dd40a27f354944609fb50ead0a8a47ccbd3768b779601928b47eca331fa50e2b5567bb2f0