30 upstream release

Upstream tag: v30
Upstream commit: 35de3093

Signed-off-by: Christian Kellner <christian@kellner.me>
This commit is contained in:
Christian Kellner 2021-07-23 09:16:08 +00:00
parent 5a13e4f7e5
commit 6786288d2c
5 changed files with 60 additions and 40 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@
/osbuild-27.tar.gz
/osbuild-28.tar.gz
/osbuild-29.tar.gz
/osbuild-30.tar.gz

View File

@ -1,37 +1,40 @@
# we have the specfile in the root of our repository
# https://packit.dev/docs/configuration/
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
- osbuild.spec
- .packit.yaml
upstream_package_name: osbuild
downstream_package_name: osbuild
actions:
get-current-version: bash -c "git describe --tags --abbrev=0 | sed 's|v||'"
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
- job: copr_build
trigger: pull_request
metadata:
targets:
- centos-stream-8-aarch64
- centos-stream-8-x86_64
- epel-8-aarch64
- epel-8-x86_64
- fedora-all-aarch64
- fedora-all-s390x
- fedora-all
- job: copr_build
trigger: commit
metadata:
branch: main
owner: "@osbuild" # copr repo namespace
project: osbuild # copr repo name so you can consume the builds
targets:
- centos-stream-8-aarch64
- centos-stream-8-x86_64
- epel-8-aarch64
- epel-8-x86_64
- fedora-all-aarch64
- fedora-all-s390x
- fedora-all

View File

@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 0.7.2.dev96+g8ed72cd.
The file was generated using packit 0.34.0.

View File

@ -1,7 +1,7 @@
%global forgeurl https://github.com/osbuild/osbuild
%global selinuxtype targeted
Version: 29
Version: 30
%forgemeta
@ -9,7 +9,7 @@ Version: 29
%global pkgdir %{_prefix}/lib/%{pypi_name}
Name: %{pypi_name}
Release: 2%{?dist}
Release: 1%{?dist}
License: ASL 2.0
URL: %{forgeurl}
@ -90,6 +90,14 @@ Contains the necessary SELinux policies that allows
osbuild to use labels unknown to the host inside the
containers it uses to build OS artifacts.
%package tools
Summary: Extra tools and utilities
Requires: %{name} = %{version}-%{release}
%description tools
Contains additional tools and utilities for development of
manifests and osbuild.
%prep
%forgesetup
@ -133,7 +141,7 @@ mkdir -p %{buildroot}%{pkgdir}/osbuild
# schemata
mkdir -p %{buildroot}%{_datadir}/osbuild/schemas
install -p -m 0755 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
install -p -m 0644 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
ln -s %{_datadir}/osbuild/schemas %{buildroot}%{pkgdir}/schemas
# documentation
@ -143,8 +151,8 @@ install -p -m 0644 -t %{buildroot}%{_mandir}/man1/ docs/*.1
install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5
# SELinux
install -D -m 644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
install -D -m 0644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
install -D -m 0644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
%check
exit 0
@ -194,8 +202,16 @@ fi
%posttrans selinux
%selinux_relabel_post -s %{selinuxtype}
%files tools
%{_bindir}/osbuild-mpp
%changelog
* Fri Jul 23 2021 Christian Kellner <christian@kellner.me> - 30-1
- Upstream release 30
- Ship osbuild-mpp in new tools sub-package.
- Remove executable bit from schemata files.
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 29-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (osbuild-29.tar.gz) = a65fdc574386a28410344b7b5218f8190990170b5e9600f81304a09c3a8dc82a0be8c9f8f3516d906a776470db4c531efefc8cf280c8cd0ef8c673995fba5366
SHA512 (osbuild-30.tar.gz) = 311c3f5786ec5556cbf548737da11caa3e3b0edacc5ef2ff3967147c150cfce2c76961dda183efda9b3aa279b68b6e3c5c4d5c12360b66085c9893df62c224b6