diff --git a/.gitignore b/.gitignore index 46f66c5..f3ac690 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-33.3.tar.gz +SOURCES/osbuild-composer-33.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 37efe0b..499b3b9 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -dc7e4c6864e1f23c1250b7cffd8f2e5c8b346af7 SOURCES/osbuild-composer-33.3.tar.gz +18bdc85004f4f5bb687ce6c39fb9560897e659ff SOURCES/osbuild-composer-33.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 118d2ce..5b91950 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 33.3 +Version: 33 %gometa @@ -155,38 +155,8 @@ install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_l install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/ -# Only include repositories for the distribution and release install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories -# CentOS also defines rhel so we check for centos first -%if 0%{?centos} - -# CentOS 9 supports building for CentOS 8 and later -%if 0%{?centos} >= 9 -install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ -%else -# CentOS 8 only supports building for CentOS 8 -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/ - -%endif -%else -%if 0%{?rhel} -# RHEL 9 supports building for RHEL 8 and later -%if 0%{?rhel} >= 9 -install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ - -%else -# RHEL 8 only supports building for 8 -install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ - -%endif -%endif -%endif - -# Fedora can build for all included fedora releases -%if 0%{?fedora} -install -m 0644 -vp repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ -%endif +install -m 0644 -vp repositories/* %{buildroot}%{_datadir}/osbuild-composer/repositories/ install -m 0755 -vd %{buildroot}%{_unitdir} install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/ @@ -378,7 +348,6 @@ Requires: python3-lxml Requires: httpd Requires: mod_ssl Requires: openssl -Requires: firewalld # see https://bugzilla.redhat.com/show_bug.cgi?id=1986333 %if 0%{?rhel} && 0%{?rhel} != 9 Requires: podman-plugins @@ -407,15 +376,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Sat Oct 02 2021 Ondřej Budai - 33.3-1 -- New upstream release - -* Tue Sep 28 2021 Ondřej Budai - 33.2-1 -- New upstream release - -* Wed Sep 15 2021 Ondřej Budai - 33.1-1 -- New upstream release - * Mon Aug 30 2021 Tom Gundersen - 33-1 - New upstream release