diff --git a/.gitignore b/.gitignore index 734eeb8..dcd75c8 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,5 @@ /blivet-3.7.0.tar.gz /blivet-3.7.1.tar.gz /blivet-3.7.1-tests.tar.gz +/blivet-3.8.0-tests.tar.gz +/blivet-3.8.0.tar.gz diff --git a/python-blivet.spec b/python-blivet.spec index 2452c47..299add5 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -1,29 +1,11 @@ -%define is_rhel 0%{?rhel} != 0 - -# python3 is not available on RHEL <=7 -%if %{is_rhel} && 0%{?rhel} <= 7 -# disable python3 by default -%bcond_with python3 -%else -%bcond_without python3 -%endif - -# python2 is not available on RHEL > 7 and not needed on Fedora > 28 -%if 0%{?rhel} > 7 || 0%{?fedora} > 28 -# disable python2 by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - Summary: A python module for system storage configuration Name: python-blivet Url: https://storageapis.wordpress.com/projects/blivet -Version: 3.7.1 +Version: 3.8.0 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 5%{?prerelease}%{?dist} +Release: 1%{?prerelease}%{?dist} Epoch: 1 License: LGPL-2.1-or-later %global realname blivet @@ -35,16 +17,12 @@ Source1: http://github.com/storaged-project/blivet/archive/%{realname}-%{realver Patch0: 0001-remove-btrfs-plugin.patch %endif -Patch1: 0002-Add-support-for-specifying-stripe-size-for-RAID-LVs.patch -Patch2: 0003-Add-support-for-filesystem-online-resize.patch -Patch3: 0004-Always-prefer-GPT-disk-labels-on-x86_64-and-clean-up.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). %global partedver 1.8.1 %global pypartedver 3.10.4 %global utillinuxver 2.15.1 -%global libblockdevver 2.24 +%global libblockdevver 3.0 %global libbytesizever 0.3 %global pyudevver 0.18 @@ -67,7 +45,6 @@ Conflicts: python3-blivet < 1:2.0.0 The %{realname}-data package provides data files required by the %{realname} python module. -%if %{with python3} %package -n python3-%{realname} Summary: A python3 package for examining and modifying storage configuration. @@ -106,76 +83,19 @@ Requires: %{realname}-data = %{epoch}:%{version}-%{release} Obsoletes: blivet-data < 1:2.0.0 -%if %{without python2} -Obsoletes: python2-blivet < 1:2.0.2-2 -Obsoletes: python-blivet < 1:2.0.2-2 -%else -Obsoletes: python-blivet < 1:2.0.0 -%endif - %description -n python3-%{realname} The python3-%{realname} is a python3 package for examining and modifying storage configuration. -%endif - -%if %{with python2} -%package -n python2-%{realname} -Summary: A python2 package for examining and modifying storage configuration. - -%{?python_provide:%python_provide python2-%{realname}} - -BuildRequires: gettext -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -Requires: python2 -Requires: python2-six -Requires: python2-pyudev >= %{pyudevver} -Requires: parted >= %{partedver} -Requires: python2-pyparted >= %{pypartedver} -Requires: python2-libselinux -Requires: python2-blockdev >= %{libblockdevver} -Recommends: libblockdev-btrfs >= %{libblockdevver} -Recommends: libblockdev-crypto >= %{libblockdevver} -Recommends: libblockdev-dm >= %{libblockdevver} -Recommends: libblockdev-fs >= %{libblockdevver} -Recommends: libblockdev-kbd >= %{libblockdevver} -Recommends: libblockdev-loop >= %{libblockdevver} -Recommends: libblockdev-lvm >= %{libblockdevver} -Recommends: libblockdev-mdraid >= %{libblockdevver} -Recommends: libblockdev-mpath >= %{libblockdevver} -Recommends: libblockdev-nvdimm >= %{libblockdevver} -Recommends: libblockdev-part >= %{libblockdevver} -Recommends: libblockdev-swap >= %{libblockdevver} -Recommends: libblockdev-s390 >= %{libblockdevver} -Requires: python2-bytesize >= %{libbytesizever} -Requires: util-linux >= %{utillinuxver} -Requires: lsof -Requires: python2-hawkey -Requires: %{realname}-data = %{epoch}:%{version}-%{release} - -Requires: systemd-udev -Requires: python2-gobject-base - -Obsoletes: blivet-data < 1:2.0.0 -Obsoletes: python-blivet < 1:2.0.0 - -%description -n python2-%{realname} -The python2-%{realname} is a python2 package for examining and modifying storage -configuration. -%endif %prep %autosetup -n %{realname}-%{realversion} -N %autosetup -n %{realname}-%{realversion} -b1 -p1 %build -%{?with_python2:make PYTHON=%{__python2}} -%{?with_python3:make PYTHON=%{__python3}} +make %install -%{?with_python2:make PYTHON=%{__python2} DESTDIR=%{buildroot} install} -%{?with_python3:make PYTHON=%{__python3} DESTDIR=%{buildroot} install} +make DESTDIR=%{buildroot} install %find_lang %{realname} @@ -185,21 +105,50 @@ configuration. %{_libexecdir}/* %{_unitdir}/* -%if %{with python2} -%files -n python2-%{realname} -%license COPYING -%doc README.md ChangeLog examples -%{python2_sitelib}/* -%endif - -%if %{with python3} %files -n python3-%{realname} %license COPYING %doc README.md ChangeLog examples %{python3_sitelib}/* -%endif %changelog +* Thu Jun 29 2023 Vojtech Trefny - 3.8.0-1 +- Revert "Makefile cleanup" (blivet-ci) +- Require libblockdev 3.0 when importing from GI (vtrefny) +- spec: Bump required version of libblockdev to 3.0 (vtrefny) +- md: Adapt libblockdev 3.0 mdraid bitmap arg changes (tbzatek) +- spec: Bump release to 99 to be always ahead of Fedora in nightly (vtrefny) +- ci: Run GH actions tests in a Fedora container (vtrefny) +- Add new LUKS tests for add/remove key and key file usage (vtrefny) +- Adjust to the new libblockdev 3.0 crypto API (vtrefny) +- Adjust to libblockdev 3.0 API changes (vtrefny) +- blivet: Enable the extended node bitmap for F2FS (akoskovich) +- Remove all state-dependent objects when resetting Blivet DBus object. (dlehman) +- Run callbacks when pruning actions. (dlehman) +- Always prefer GPT disk labels on x86_64 (and clean up the logic) (awilliam) +- Do not add new PVs to the LVM devices file if it doesn't exist and VGs are present (vtrefny) +- Add RISCV64 architecture helper [is_riscv64()] for arch module. (48907457+nirousseau) +- iscsi: Extend allowed CHAP auth algorithms (tbzatek) +- Fix checking FIPS mode when /proc/sys/crypto/fips_enabled doesn't exist (vtrefny) +- Fix creating LUKS1 on disks with mixed sector size (#2188785) (vtrefny) +- Do not set memory limit for LUKS2 when running in FIPS mode (vtrefny) +- Revert "tests: Skip test_lvcreate_type on CentOS/RHEL 9" (vtrefny) +- DBus: remove extra callback invocations (dlehman) +- Add a test case for filesystem online resize (vtrefny) +- Add support for filesystem online resize (vtrefny) +- iscsi: Use UDisks instead of storaged in the availability message (vtrefny) +- tests: Fix skipping iSCSI tests if UDisks iSCSI isn't available (vtrefny) +- Add ChangeLog to .gitignore (vtrefny) +- Makefile cleanup (vtrefny) +- ci: Use Packit for daily builds in Copr (vtrefny) +- Avoid raising libblockdev exceptions from our code (vtrefny) +- ci: Fix Packit configuration (vtrefny) +- Add support for specifying stripe size for RAID LVs (vtrefny) +- tests: Use blivet-specific prefix for targetcli backing files (vtrefny) +- Add a basic test case for the iscsi module (vtrefny) +- Allow changing iSCSI initiator name after setting it (vtrefny) +- Prefer UUID for fstab spec for DM devices too (vtrefny) +- Remove support for Python 2 from spec and Makefile (vtrefny) + * Tue Jun 13 2023 Python Maint - 1:3.7.1-5 - Rebuilt for Python 3.12 diff --git a/sources b/sources index 191a8d3..0d5c4b4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (blivet-3.7.1.tar.gz) = 2a4f17e3551e24f78d2975bbe9fa21a57026f643a38e1fcd5d5ce8927cc7f224d4df68c2f23e99087be0a10459e4c1f758332cab70ee1fcab477f8dcf2e4c4ac -SHA512 (blivet-3.7.1-tests.tar.gz) = a3561f972962f6aad3f2ea4ad88f5e307c68fefb4d742085130cf4f232cd6d924f59ae06df602017542a83a1164ad7356b5518e8c3d07d07ab31880f94421db7 +SHA512 (blivet-3.8.0-tests.tar.gz) = da0b4f68615a77b499ea4f5e192c4f22a15331e1e27a79d1a1a147dfc2dcefc4b18c641ab299e91b86ccdd29cf6c39bcb85a1c9e53bb606a7da4c5564e73f25e +SHA512 (blivet-3.8.0.tar.gz) = 25686e77ebf4feed887929ac33494012d4e36b20e04500c9e882fac357688622f4d54df25345bae087b6be4df3a9312818f1451fab643b3006b43fdc9b81ccd4