diff --git a/.gitignore b/.gitignore index a114f2d..0d77817 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /osbuild-composer-128.tar.gz /osbuild-composer-131.tar.gz /osbuild-composer-132.tar.gz +/osbuild-composer-135.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index d56e12d..aa53b61 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -12,7 +12,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 132 +Version: 135 %gometa @@ -158,12 +158,13 @@ install -m 0755 -vd %{buildroot}% # Latest CentOS supports building all CentOS versions %if 0%{?centos} >= 10 -install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %else # All other CentOS versions support building for the same version -install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ -install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +# centos-stream-* are symlinks +cp -a repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif %else @@ -171,7 +172,7 @@ install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}% %if 0%{?rhel} # RHEL 10 supports building all RHEL versions %if 0%{?rhel} >= 10 -for REPO_FILE in $(ls repositories/rhel-* | grep -v 'no-aux-key'); do +for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-* ); do install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) done @@ -182,13 +183,13 @@ done %else # All other RHEL versions support building for the same version -for REPO_FILE in $(ls repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do +for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-%{rhel}* ); do install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) done # RHEL 9 supports building also for RHEL 8 %if 0%{?rhel} == 9 -for REPO_FILE in $(ls repositories/rhel-8* | grep -v 'no-aux-key'); do +for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-8* ); do install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) done %endif @@ -199,7 +200,7 @@ done # Fedora can build for all included fedora releases %if 0%{?fedora} -install -m 0644 -vp repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif install -m 0755 -vd %{buildroot}%{_unitdir} @@ -453,6 +454,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Mar 05 2025 imagebuilder-bot - 135-1 +- New upstream release + * Thu Feb 13 2025 imagebuilder-bot - 132-1 - New upstream release diff --git a/sources b/sources index 33f68ee..416e08b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-132.tar.gz) = df56fb901459a94fee92db1f438f28b382a0a91c36b4cd703ba9b07f51a36ed4c4d531550c3145f5ecf1939b5e5ef195be7bb79f57548d7589e5012cf0bcfa65 +SHA512 (osbuild-composer-135.tar.gz) = 580728823b65442e3331528337aefcc9daa9aa729f30928b7faf1ed9d63cc9c06d413771ab82f849d4746036de32f6695214e163003ad350597b56d77d96a218