diff --git a/ec2imgutils-10.0.3.tar.bz2 b/ec2imgutils-10.0.3.tar.bz2 deleted file mode 100644 index 958715d..0000000 --- a/ec2imgutils-10.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75fc520bdb566e9957ced455498f428b6120c11e61391c2fcfbbf7206ec783d6 -size 42269 diff --git a/ec2imgutils-10.0.4.tar.bz2 b/ec2imgutils-10.0.4.tar.bz2 new file mode 100644 index 0000000..9ea2c63 --- /dev/null +++ b/ec2imgutils-10.0.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7179be91a201201370f073b9565d1c56019c6501f73e43bc38ea3689301c0c4 +size 42529 diff --git a/python-ec2imgutils.changes b/python-ec2imgutils.changes index 8cd5963..daa0115 100644 --- a/python-ec2imgutils.changes +++ b/python-ec2imgutils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu May 29 15:56:54 UTC 2025 - João Mello + +- Create subnet and security-group when they are not provided via config + file nor command line options. (bsc#1214626) +- Add support for building AWS Nitro Enclave images. (bsc#1230401) +- The translation of the `ssd` value for the backing_store param changes + from `gp2` to `gp3`. + + +------------------------------------------------------------------- +Fri Apr 18 19:11:34 UTC 2025 - Robert Schweikert + +- Change the build to use a specific Python interpreter rather than building + multiple versions. + ------------------------------------------------------------------- Wed Apr 24 11:23:49 UTC 2024 - Robert Schweikert diff --git a/python-ec2imgutils.spec b/python-ec2imgutils.spec index c63ae97..56751d2 100644 --- a/python-ec2imgutils.spec +++ b/python-ec2imgutils.spec @@ -1,7 +1,7 @@ # # spec file for package python-ec2imgutils # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,34 +16,32 @@ # -%define upstream_name ec2imgutils -%if 0%{?suse_version} > 1500 -%bcond_without libalternatives +%if 0%{?suse_version} >= 1600 +%define pythons %{primary_python} %else -%bcond_with libalternatives -%endif -%define python python %{?sle15_python_module_pythons} +%endif +%global _sitelibdir %{%{pythons}_sitelib} +%define upstream_name ec2imgutils Name: python-ec2imgutils -Version: 10.0.3 +Version: 10.0.4 Release: 0 Summary: Image management utilities for AWS EC2 License: GPL-3.0-or-later Group: System/Management URL: https://github.com/SUSE-Enceladus/ec2imgutils Source0: %{upstream_name}-%{version}.tar.bz2 -BuildRequires: %{python_module boto3 >= 1.29.84} -BuildRequires: %{python_module dateutil} -BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module wheel} +BuildRequires: %{pythons}-boto3 >= 1.29.84 +BuildRequires: %{pythons}-dateutil +BuildRequires: %{pythons}-pip +BuildRequires: %{pythons}-setuptools +BuildRequires: %{pythons}-wheel BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python -Requires: python-boto3 >= 1.29.84 -Requires: python-dateutil -Requires: python-paramiko >= 2.2.0 +Requires: %{pythons}-boto3 >= 1.29.84 +Requires: %{pythons}-dateutil +Requires: %{pythons}-paramiko >= 2.2.0 %if %{with libalternatives} BuildRequires: alts Requires: alts @@ -53,17 +51,17 @@ Requires(postun): update-alternatives %endif BuildArch: noarch -%if "%{python_provides}" == "python3" || (0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000) +%if "%{python_provides}" == "python3" || (0%{?sle_version} > 150400 && 0%{?sle_version} < 160000) # Package renamed in SLE 12 do not remove Provides, Obsolete -# directives until after SLE 12 EOL -Provides: %python-ec2utilsbase:/usr/lib/python2.7/site-packages/ec2utils -Obsoletes: %python-ec2utilsbase < %{version} -Provides: %python-ec2deprecateimg:%{_bindir}/ec2deprecateimg -Obsoletes: %python-ec2deprecateimg < %{version} -Provides: %python-ec2publishimg:%{_bindir}/ec2publishimg -Obsoletes: %python-ec2publishimg < %{version} -Provides: %python-ec2uploadimg:%{_bindir}/ec2uploadimg -Obsoletes: %python-ec2uploadimg < %{version} +# directives until after SLE 12 EOL. This is for migration to SLE 15 +Provides: python-ec2utilsbase:/usr/lib/python2.7/site-packages/ec2utils +Obsoletes: python-ec2utilsbase < %{version} +Provides: python-ec2deprecateimg:%{_bindir}/ec2deprecateimg +Obsoletes: python-ec2deprecateimg < %{version} +Provides: python-ec2publishimg:%{_bindir}/ec2publishimg +Obsoletes: python-ec2publishimg < %{version} +Provides: python-ec2uploadimg:%{_bindir}/ec2uploadimg +Obsoletes: python-ec2uploadimg < %{version} # Package rename in SLE 15 GA do not remove Provides, Obsolete # directives until after SLE 15 SP3 EOL @@ -79,7 +77,12 @@ Obsoletes: python3-ec2uploadimg < %{version} # Package rename in SLE 15 SP4 to comply with new naming convention Obsoletes: python3-ec2imgutils < %{version} %endif -%python_subpackages + +# For Factory +Obsoletes: python310-ec2imgutils < %{version} +Obsoletes: python311-ec2imgutils < %{version} +Obsoletes: python312-ec2imgutils < %{version} +Obsoletes: python313-ec2imgutils < %{version} %description A collection of image manipulation utilities for AWS EC2. These include: @@ -97,63 +100,23 @@ A collection of image manipulation utilities for AWS EC2. These include: %pyproject_install install -d -m 755 %{buildroot}/%{_mandir}/man1 install -m 644 man/man1/* %{buildroot}/%{_mandir}/man1 +%fdupes %{buildroot}%{_sitelibdir} -%python_clone -a %{buildroot}%{_bindir}/ec2deprecateimg -%python_clone -a %{buildroot}%{_mandir}/man1/ec2deprecateimg.1 - -%python_clone -a %{buildroot}%{_bindir}/ec2listimg -%python_clone -a %{buildroot}%{_mandir}/man1/ec2listimg.1 - -%python_clone -a %{buildroot}%{_bindir}/ec2publishimg -%python_clone -a %{buildroot}%{_mandir}/man1/ec2publishimg.1 - -%python_clone -a %{buildroot}%{_bindir}/ec2removeimg -%python_clone -a %{buildroot}%{_mandir}/man1/ec2removeimg.1 - -%python_clone -a %{buildroot}%{_bindir}/ec2uploadimg -%python_clone -a %{buildroot}%{_mandir}/man1/ec2uploadimg.1 - -%{python_expand %fdupes %{buildroot}%{$python_sitelib}} - -%pre -# If libalternatives is used: Removing old update-alternatives entries. -%python_libalternatives_reset_alternative ec2deprecateimg -%python_libalternatives_reset_alternative ec2listimg -%python_libalternatives_reset_alternative ec2publishimg -%python_libalternatives_reset_alternative ec2removeimg -%python_libalternatives_reset_alternative ec2uploadimg - -%post -# keep the alternative groups separate. Users could decide to let pip and pip3 point to -# different flavors -%{python_install_alternative ec2deprecateimg ec2deprecateimg.1} -%{python_install_alternative ec2listimg ec2listimg.1} -%{python_install_alternative ec2publishimg ec2publishimg.1} -%{python_install_alternative ec2removeimg ec2removeimg.1} -%{python_install_alternative ec2uploadimg ec2uploadimg.1} - -%postun -%{python_uninstall_alternative ec2deprecateimg ec2deprecateimg.1} -%{python_uninstall_alternative ec2listimg ec2listimg.1} -%{python_uninstall_alternative ec2publishimg ec2publishimg.1} -%{python_uninstall_alternative ec2removeimg ec2removeimg.1} -%{python_uninstall_alternative ec2uploadimg ec2uploadimg.1} - -%files %{python_files} +%files %doc README.md %license LICENSE -%python_alternative %{_bindir}/ec2deprecateimg -%python_alternative %{_bindir}/ec2listimg -%python_alternative %{_bindir}/ec2publishimg -%python_alternative %{_bindir}/ec2removeimg -%python_alternative %{_bindir}/ec2uploadimg -%python_alternative %{_mandir}/man1/ec2deprecateimg.1%{?ext_man} -%python_alternative %{_mandir}/man1/ec2listimg.1%{?ext_man} -%python_alternative %{_mandir}/man1/ec2publishimg.1%{?ext_man} -%python_alternative %{_mandir}/man1/ec2removeimg.1%{?ext_man} -%python_alternative %{_mandir}/man1/ec2uploadimg.1%{?ext_man} +%{_bindir}/ec2deprecateimg +%{_bindir}/ec2listimg +%{_bindir}/ec2publishimg +%{_bindir}/ec2removeimg +%{_bindir}/ec2uploadimg +%{_mandir}/man1/ec2deprecateimg.1%{?ext_man} +%{_mandir}/man1/ec2listimg.1%{?ext_man} +%{_mandir}/man1/ec2publishimg.1%{?ext_man} +%{_mandir}/man1/ec2removeimg.1%{?ext_man} +%{_mandir}/man1/ec2uploadimg.1%{?ext_man} -%{python_sitelib}/ec2imgutils/ -%{python_sitelib}/ec2imgutils-*.dist-info/ +%{_sitelibdir}/ec2imgutils/ +%{_sitelibdir}/ec2imgutils-*.dist-info/ %changelog