diff --git a/.gitignore b/.gitignore index ad3f377..aa73928 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ /osbuild-composer-128.tar.gz /osbuild-composer-131.tar.gz /osbuild-composer-132.tar.gz +/osbuild-composer-134.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 5e6c3a5..16aa92e 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -12,7 +12,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 132 +Version: 134 %gometa @@ -179,12 +179,13 @@ install -m 0644 -vp repositories/almalinux-9* %{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 @@ -192,7 +193,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 @@ -203,13 +204,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 @@ -222,7 +223,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} @@ -476,10 +477,14 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Wed Feb 19 2025 Eduard Abdullin - 132-1.alma.1 +* Tue Feb 25 2025 Eduard Abdullin - 134-1.alma.1 - Add AlmaLinux support patch - Add AlmaLinux-Kitten support patch +* Mon Feb 24 2025 Tomáš Hozza - 134-1 +- New upstream release +- Resolves: RHEL-80161 + * Thu Feb 13 2025 imagebuilder-bot - 132-1 - New upstream release diff --git a/sources b/sources index 33f68ee..8578b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-132.tar.gz) = df56fb901459a94fee92db1f438f28b382a0a91c36b4cd703ba9b07f51a36ed4c4d531550c3145f5ecf1939b5e5ef195be7bb79f57548d7589e5012cf0bcfa65 +SHA512 (osbuild-composer-134.tar.gz) = aecf71defb146b22407faa8fb47b46cb0a76125dd8fff649e6e5e88c55bf88978010a1e8cc748070ddfd7dfc5640c330662971e15bdf555b58e5b1fc8ad5525b