diff --git a/.gitignore b/.gitignore index edd991c..247dcbc 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /osbuild-composer-59.tar.gz /osbuild-composer-60.tar.gz /osbuild-composer-62.tar.gz +/osbuild-composer-67.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 55f8162..9f84aec 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 62 +Version: 67 %gometa @@ -251,9 +251,6 @@ install -m 0644 -vp test/data/koji/* %{buildroot}% install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/x509 install -m 0644 -vp test/data/x509/* %{buildroot}%{_datadir}/tests/osbuild-composer/x509/ -install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/openshift -install -m 0644 -vp test/data/openshift/* %{buildroot}%{_datadir}/tests/osbuild-composer/openshift/ - install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/ @@ -309,10 +306,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe Summary: The worker for osbuild-composer Requires: systemd Requires: qemu-img -Requires: osbuild >= 63 -Requires: osbuild-ostree >= 63 -Requires: osbuild-lvm2 >= 63 -Requires: osbuild-luks2 >= 63 +Requires: osbuild >= 70 +Requires: osbuild-ostree >= 70 +Requires: osbuild-lvm2 >= 70 +Requires: osbuild-luks2 >= 70 Requires: %{name}-dnf-json = %{version}-%{release} %description worker @@ -353,6 +350,12 @@ The dnf-json binary used by osbuild-composer and the workers. %files dnf-json %{_libexecdir}/osbuild-composer/dnf-json +%post dnf-json +# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root +if [ -e /var/cache/osbuild-composer/rpmmd ]; then + chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd +fi + %if %{with tests} || 0%{?rhel} %package tests @@ -424,6 +427,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com - 67-1 +- New upstream release + * Mon Aug 29 2022 Ondřej Budai - 62-1 - New upstream release diff --git a/sources b/sources index 70cccc5..766a286 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-62.tar.gz) = 4ed1da1779ac0ad1f2a4b45d42f81a5d04bb98d3fa886997c9e37cddf060c317fab3a05f40607d1f692581031ddbe2cd0fd051c639edc02553145d5dfe2fbb36 +SHA512 (osbuild-composer-67.tar.gz) = ca3e0c7cdb92a547108391c45f24c01b22f2eede54cd087eb020651a2122666109f18f8c16790020a23465a5e68b07ca8acef037a5e1472cea5b03bc756dc472