From 8f24b3225fb79a8f2e41252747aef58b07009fb4 Mon Sep 17 00:00:00 2001 From: Martin Sehnoutka Date: Wed, 18 Sep 2019 10:45:47 +0200 Subject: [PATCH 1/4] [packit] 2 upstream release Upstream tag: 2 Upstream commit: 209d3fa437678eb79da30ac21659fb01321eeb1a Signed-off-by: Martin Sehnoutka --- .gitignore | 1 + .packit.yaml | 32 ++++++++++++++++++++++++++++++++ README.packit | 2 ++ osbuild.spec | 7 +++++-- sources | 2 +- 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 1a88be8..db51aac 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /1.tar.gz +/2.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..ce4c982 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,32 @@ +# 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-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 f30 + - 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..a929557 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,8 +1,8 @@ %global pypi_name osbuild Name: %{pypi_name} -Version: 1 -Release: 2%{?dist} +Version: 2 +Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/osbuild/osbuild @@ -72,6 +72,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* 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..2fc7868 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (1.tar.gz) = 24339d7d121f01f18a21a026dd495555b119b4c5f7a4d80b7c0a94392bbadcc21cc92439f0035faf39d7fb3921e17d85676db9ff4683be22255b9cd9844b1f2b +SHA512 (2.tar.gz) = 89debb8504dd5cb8cd4f07aad3dbfbb3ce5577a6b9267f862b214a18c2e24b3a16fc5b11d801294ef58c3f0e110bebda0753a9c1ba7d322180a386e75b29335a From b9e773fbecb1b8c5c19c892963b4f6284423c99f Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Fri, 4 Oct 2019 11:32:56 +0200 Subject: [PATCH 2/4] [packit] 3 upstream release Upstream tag: 3 Upstream commit: cd49e2407c83f7fcdf30566af5f7ab470d801e19 Signed-off-by: Lars Karlitski --- .gitignore | 1 + osbuild.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index db51aac..815fd85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /1.tar.gz /2.tar.gz +/3.tar.gz diff --git a/osbuild.spec b/osbuild.spec index a929557..4748672 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,8 @@ %global pypi_name osbuild +%global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 2 +Version: 3 Release: 1%{?dist} License: ASL 2.0 @@ -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,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Fri Oct 04 2019 Lars Karlitski - 3-1 +- new upstream release: 3 + * Wed Sep 18 2019 Martin Sehnoutka - 2-1 - new upstream release: 2 diff --git a/sources b/sources index 2fc7868..62b6ff9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (2.tar.gz) = 89debb8504dd5cb8cd4f07aad3dbfbb3ce5577a6b9267f862b214a18c2e24b3a16fc5b11d801294ef58c3f0e110bebda0753a9c1ba7d322180a386e75b29335a +SHA512 (3.tar.gz) = cc69f022ac5d6cbe2e37d11f750db8e7dfb2c9df2847b4f4a0f0fcfd3c4c1e1fb96fac21f8d9b36662c4d8bc597caf285bd822c7209111a9cae3c6cda57f46f7 From 738c85b3d9dbe382a284f0f2d1193e404ef74dbe Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Wed, 16 Oct 2019 15:36:46 +0100 Subject: [PATCH 3/4] [packit] 4 upstream release Upstream tag: 4 Upstream commit: f87e1bfb9887462f5a193c80422e59e653b5d52a Signed-off-by: Tom Gundersen --- .gitignore | 1 + .packit.yaml | 7 ++++++- osbuild.spec | 5 ++++- sources | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 815fd85..9eb022d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /1.tar.gz /2.tar.gz /3.tar.gz +/4.tar.gz diff --git a/.packit.yaml b/.packit.yaml index ce4c982..2045f18 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -13,6 +13,7 @@ jobs: 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) @@ -25,7 +26,11 @@ jobs: trigger: release metadata: dist-git-branch: master - # The same as above only for f30 + # The same as above only for f31 + - job: propose_downstream + trigger: release + metadata: + dist-git-branch: f31 - job: propose_downstream trigger: release metadata: diff --git a/osbuild.spec b/osbuild.spec index 4748672..ff7e366 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -2,7 +2,7 @@ %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 3 +Version: 4 Release: 1%{?dist} License: ASL 2.0 @@ -73,6 +73,9 @@ exit 0 %{python3_sitelib}/%{pypi_name}/ %changelog +* Wed Oct 16 2019 Tom Gundersen - 4-1 +- new upstream release: 4 + * Fri Oct 04 2019 Lars Karlitski - 3-1 - new upstream release: 3 diff --git a/sources b/sources index 62b6ff9..2f00f8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.tar.gz) = cc69f022ac5d6cbe2e37d11f750db8e7dfb2c9df2847b4f4a0f0fcfd3c4c1e1fb96fac21f8d9b36662c4d8bc597caf285bd822c7209111a9cae3c6cda57f46f7 +SHA512 (4.tar.gz) = e66d5c771839fb674e3513361f89c141e2b2f1f64a341cf93a7d6ba98b09e5f12ba255c3fe6b6626b9e7083e450366d35017a638ba8c55d8988ae2209ef4253c From 8c5bb4d1108c35e49627e8c8d94dabcdea8d9a93 Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Wed, 30 Oct 2019 18:59:40 +0100 Subject: [PATCH 4/4] [packit] 5 upstream release Upstream tag: 5 Upstream commit: 1f526477d27ead42360c5bf2e499f3d0f90c0ef2 Signed-off-by: Lars Karlitski --- .gitignore | 1 + osbuild.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9eb022d..965ca20 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /2.tar.gz /3.tar.gz /4.tar.gz +/5.tar.gz diff --git a/osbuild.spec b/osbuild.spec index ff7e366..404a289 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -2,7 +2,7 @@ %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Version: 4 +Version: 5 Release: 1%{?dist} License: ASL 2.0 @@ -73,6 +73,9 @@ 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 diff --git a/sources b/sources index 2f00f8d..43c3172 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.tar.gz) = e66d5c771839fb674e3513361f89c141e2b2f1f64a341cf93a7d6ba98b09e5f12ba255c3fe6b6626b9e7083e450366d35017a638ba8c55d8988ae2209ef4253c +SHA512 (5.tar.gz) = 95cafa010f8f223a568ece8bb331fcbcbef350a87922965c97cdcd9dd40a27f354944609fb50ead0a8a47ccbd3768b779601928b47eca331fa50e2b5567bb2f0