diff --git a/.gitignore b/.gitignore index 7b25e11..ee15df1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /osbuild-composer-20.tar.gz /osbuild-composer-22.tar.gz /osbuild-composer-23.tar.gz +/osbuild-composer-24.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 848f563..9572262 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 23 +Version: 24 %gometa @@ -77,6 +77,9 @@ Obsoletes: lorax-composer < 34.3 Obsoletes: golang-github-osbuild-composer < %{version}-%{release} Provides: golang-github-osbuild-composer = %{version}-%{release} +# remove when F34 is EOL +Obsoletes: osbuild-composer-koji + %description %{common_description} @@ -158,7 +161,6 @@ install -m 0644 -vp distribution/osbuild-remote-worker.socket %{buildroot}%{_u install -m 0644 -vp distribution/osbuild-remote-worker@.service %{buildroot}%{_unitdir}/ install -m 0644 -vp distribution/osbuild-worker@.service %{buildroot}%{_unitdir}/ install -m 0644 -vp distribution/osbuild-composer-api.socket %{buildroot}%{_unitdir}/ -install -m 0644 -vp distribution/osbuild-composer-koji.socket %{buildroot}%{_unitdir}/ install -m 0755 -vd %{buildroot}%{_unitdir} install -m 0644 -vp distribution/osbuild-composer.{service,socket} %{buildroot}%{_unitdir}/ install -m 0644 -vp distribution/osbuild-*worker*.{service,socket} %{buildroot}%{_unitdir}/ @@ -294,7 +296,6 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service" %package tests Summary: Integration tests Requires: %{name} = %{version}-%{release} -Requires: %{name}-koji = %{version}-%{release} Requires: composer-cli Requires: createrepo_c Requires: genisoimage @@ -346,34 +347,10 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif -%package koji -Summary: osbuild-composer for pushing images to Koji -Requires: %{name} = %{version}-%{release} - -# remove in F34 -Obsoletes: golang-github-osbuild-composer-rcm < %{version}-%{release} -Provides: golang-github-osbuild-composer-rcm = %{version}-%{release} -# remove in the future -Obsoletes: osbuild-composer-rcm < %{version}-%{release} -Provides: osbuild-composer-rcm = %{version}-%{release} - -%description koji -osbuild-composer specifically for pushing images to Koji. This package is only -needed for backwards compatibility and will be removed in the future. - -%files koji -%{_unitdir}/osbuild-composer-koji.socket - -%post koji -%systemd_post osbuild-composer-koji.socket - -%preun koji -%systemd_preun osbuild-composer-koji.socket - -%postun koji -%systemd_postun_with_restart osbuild-composer-koji.socket - %changelog +* Thu Nov 12 2020 Ondrej Budai - 24-1 +- New upstream release + * Fri Nov 06 2020 Ondrej Budai - 23-1 - New upstream release diff --git a/sources b/sources index c460aa1..11f6b71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-23.tar.gz) = 6b87b0c4c578978f9d99cafad6ad954b625a6ae944dac5a16c1002268640129253961e2cef2d680a2ec7c98848a2837f3e88172fe8bea6fe4e82fe89a2c4fd8b +SHA512 (osbuild-composer-24.tar.gz) = 4146f0a1313b438d869c9110706591e6ce939002b6d64a8a3c196ac94b222d9596f4a34100d2dc29b0505a3150ad9da13bec4d1039650be0ff807b9e7f112e5e