diff --git a/.gitignore b/.gitignore index 419132d..b6b7d9e 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ /blivet-2.1.9.tar.gz /blivet-2.1.10.tar.gz /blivet-2.1.11.tar.gz +/blivet-3.0.0.b1.tar.gz diff --git a/python-blivet.spec b/python-blivet.spec index 1714683..1ee0c2d 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -1,11 +1,20 @@ +%define is_rhel 0%{?rhel} != 0 + +# python3 is not available on RHEL +%if %{is_rhel} +%define with_python3 0 +%else +%define with_python3 1 +%endif + Summary: A python module for system storage configuration Name: python-blivet Url: https://www-rhstorage.rhcloud.com/projects/blivet -Version: 2.1.11 +Version: 3.0.0 -#%%global prerelease .b1 +%global prerelease .b1 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 3%{?prerelease}%{?dist} +Release: 0.1%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -15,7 +24,6 @@ Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realver # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). -%global pykickstartver 1.99.22 %global partedver 1.8.1 %global pypartedver 3.10.4 %global utillinuxver 2.15.1 @@ -24,18 +32,36 @@ Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realver %global pyudevver 0.18 BuildArch: noarch -BuildRequires: gettext -BuildRequires: python3-devel python3-setuptools %description The python-blivet package is a python module for examining and modifying storage configuration. +%package -n %{realname}-data +Summary: Data for the %{realname} python module. + +BuildRequires: systemd + +Conflicts: python-blivet < 1:2.0.0 +Conflicts: python3-blivet < 1:2.0.0 + +%description -n %{realname}-data +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. + +%{?python_provide:%python_provide python3-%{realname}} + +BuildRequires: gettext +BuildRequires: python3-pocketlint >= %{pocketlintver} +BuildRequires: python3-devel +BuildRequires: python3-setuptools + Requires: python3 Requires: python3-six -Requires: python3-kickstart Requires: python3-pyudev >= %{pyudevver} Requires: parted >= %{partedver} Requires: python3-pyparted >= %{pypartedver} @@ -47,36 +73,270 @@ Requires: util-linux >= %{utillinuxver} Requires: lsof Requires: python3-gobject-base Requires: systemd-udev -Obsoletes: blivet-data < 1:2.0.3 -Obsoletes: python-blivet < 1:2.0.3 +Requires: %{realname}-data = %{epoch}:%{version}-%{release} + +Obsoletes: blivet-data < 1:2.0.0 +Obsoletes: python-blivet < 1:2.0.0 %description -n python3-%{realname} The python3-%{realname} is a python3 package for examining and modifying storage configuration. +%endif + +%package -n python2-%{realname} +Summary: A python2 package for examining and modifying storage configuration. + +%{?python_provide:%python_provide python2-%{realname}} + +BuildRequires: gettext +BuildRequires: python2-pocketlint >= %{pocketlintver} +BuildRequires: python2-devel + +%if %{is_rhel} +BuildRequires: python-setuptools +%else +BuildRequires: python2-setuptools +%endif + +Requires: python2 +Requires: python-six +Requires: python-pyudev >= %{pyudevver} +Requires: parted >= %{partedver} +Requires: pyparted >= %{pypartedver} +Requires: libselinux-python +Requires: python-blockdev >= %{libblockdevver} +Requires: libblockdev-plugins-all >= %{libblockdevver} +Requires: python-bytesize >= %{libbytesizever} +Requires: util-linux >= %{utillinuxver} +Requires: lsof +Requires: python-hawkey +Requires: %{realname}-data = %{epoch}:%{version}-%{release} + +%if %{is_rhel} +Requires: udev +Requires: pygobject3 +%else +Requires: systemd-udev +Requires: python-gobject-base +%endif + +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. %prep -%setup -q -n %{realname}-%{realversion} - -rm -rf %{py3dir} -cp -a . %{py3dir} +%autosetup -n %{realname}-%{realversion} %build -# don't try to regenerate blivet.pot as part of the rpm build. -touch po/blivet.pot -make +make PYTHON=%{__python2} + +%if %{with_python3} +make PYTHON=%{__python3} +%endif %install +make PYTHON=%{__python2} DESTDIR=%{buildroot} install + +%if %{with_python3} make PYTHON=%{__python3} DESTDIR=%{buildroot} install +%endif + %find_lang %{realname} -%files -n python3-%{realname} -f %{realname}.lang +%files -n %{realname}-data -f %{realname}.lang +%{_sysconfdir}/dbus-1/system.d/* +%{_datadir}/dbus-1/system-services/* +%{_libexecdir}/* +%{_unitdir}/* + +%files -n python2-%{realname} +%license COPYING +%doc README ChangeLog examples +%{python2_sitelib}/* + +%if %{with_python3} +%files -n python3-%{realname} %license COPYING %doc README ChangeLog examples %{python3_sitelib}/* +%endif %changelog -* Wed Oct 4 2017 Vojtech Trefny - 2.1.11-3 -- Bump release number to fix upgradepath +* Wed Nov 08 2017 David Lehman - 3.0.0-0.1.b1 +- Add some reasonable default value for LANG variable in size_test (vtrefny) +- Remove ksdata from Blivet. (dlehman) +- Fix AttributeError in fsminsize (#1502587) (vtrefny) +- Remove Blivet.write_dasd_conf and now-unused Blivet.write. (dlehman) +- Move blivet.partspec into pyanaconda. (dlehman) +- Make uboot partition weight match analogs on other platforms. (dlehman) +- Move some cmdline option checking into Flags. (dlehman) +- Move platform module into pyanaconda. (dlehman) +- Add and use new platform detection functions in arch. (dlehman) +- Move disklabel selection logic into DiskLabel. (dlehman) +- Move new partition weight calculation into PartitionDevice. (dlehman) +- Move osinstall and autopart into pyanaconda. (dlehman) +- Move default thin pool space reservation into devices.lvm. (dlehman) +- DM device subsystem is now obtained by libblockdev (japokorn) +- Document DBus interface. (dlehman) +- Mark the DBus interface as unstable. (dlehman) +- Do not try to use protected disks for autopart (vtrefny) +- Use InstallerStorage in setupDiskImagesNonZeroSizeTestCase (vtrefny) +- Clearpart test tag fixes (japokorn) +- Added support for device tags (japokorn) +- Use Ansible playbook to install test dependencies (vtrefny) +- Use addCleanup for VM tests too (vtrefny) +- Skip tests when SELinux is disabled (japokorn) +- Revert "Use libmount for MountsCache" (vtrefny) +- Only run log_method_call when flags.debug is set. (dlehman) +- Adjust Makefile and spec file for Python 2 compatibility (vtrefny) +- Adapt to anaconda_log rename (mkolman) +- Followup for custom six move for mock. (dlehman) +- Silence pylint with regard to custom six move of mock. (dlehman) +- Allow overriding PYTHONPATH when running unit tests. (dlehman) +- Supply some missing patches during device name tests. (dlehman) +- Allow time for event handling in unit tests. (dlehman) +- python2: Don't try to call unbound method w/ wrong class type. (dlehman) +- python2: threading compatibility. (dlehman) +- python2: compatibility for wraps when used on methods. (dlehman) +- python2: adapt to absence of inspect.signature. (dlehman) +- python2: python2 has no unittest.assertLogs. (dlehman) +- python2: Handle unittest.assertRaisesRegex rename. (dlehman) +- python2: Add a custom six move for mock. (dlehman) +- python2: EddEntry support for len() and indexing. (dlehman) +- python2: Don't use 'default' kwarg to 'min' (dlehman) +- python2: Use six.wraps instead of functools.wraps. (dlehman) +- python2: Use six.raise_from for chained exceptions. (dlehman) +- python2: Use six.next for iterator advancement. (dlehman) +- python2: Explicit args to super function. (dlehman) +- python2: Explicitly declare new-style classes. (dlehman) +- python2: Use six.add_metaclass instead of metaclass kwarg. (dlehman) +- Catch AttributeError if pyanaconda is missing in populator_test. (dlehman) +- Use relative imports in blivet.dbus.blivet. (dlehman) +- pylint: disable pylint warning for InstallerStorage.get_free_space (vtrefny) +- pylint: ignore some pylint warnings in tests (vtrefny) +- Use "flags.keep_empty_ext_partitions" instead of "installer_mode" (vtrefny) +- Add a WWN attr to all disk device classes. (dlehman) +- Fix flag access in selinux test. (dlehman) +- Collect HW RAID info before populating devicetree. (dlehman) +- Add HW RAID properties to DiskDevice. (dlehman) +- Add a devicelibs module for disks. (dlehman) +- Add 'jbod' as an alias for 'linear' RAID level. (dlehman) +- Add some tests for DependencyGuard (dlehman) +- Introduce the discard_new flag and use it (vpodzime) +- Use the 'C.UTF-8' locale instead of '' (vpodzime) +- Add anaconda-core, libvirt and paramiko to TEST_DEPENDENCIES (vpodzime) +- Get rid of the merge-pr script (vpodzime) +- Adjust vmtest to new DeviceFactory constructor API (vtrefny) +- Obtain factory defaults from passed-in device, if there is one. (dlehman) +- Use **kwargs for device factory ctor. (dlehman) +- Use a property to adjust factory size based on encrypted bool. (dlehman) +- Functional testing: Add support for libvirt authentication (vtrefny) +- Fixed merge error (japokorn) +- Enable LVMOnMDTestCase (vtrefny) +- LVMThinSnapShotTestCase: Fix creating of the thin snapshot (vtrefny) +- Create a better test summary when running tests in a VM (vtrefny) +- Add a script to run tests in a virtual machine (vtrefny) +- Move BlivetResetTestCases from ImageBackedTestCase to VMBackedTestCase + (vtrefny) +- Add a test case for tests running in a virtual machine (vtrefny) +- Do not try to create format for snapshots in create_device (vtrefny) +- Use None as mountpoint for new snapshots (vtrefny) +- Do not try to unset flags on other devices than partitions (vtrefny) +- Fix TypeError when calling blivet.reset() (vtrefny) +- Broke backwards API compatibility of LUKS handling (japokorn) +- Default to LVM in the device factory. (dlehman) +- Add callbacks for populate (vpodzime) +- Fix checks when changing fslabel using actions (vtrefny) +- Remove deprecated method udev.device_is_realdisk (vtrefny) +- Use libmount for MountsCache (vtrefny) +- Fix initialization of ignored, exclusive disks. (dlehman) +- Fix devicetree tests to use callbacks instead of record_change. (dlehman) +- Change udev.device_is_disk to match disks only (vtrefny) +- Fix udev.resolve_glob to match device path too (vtrefny) +- Add tests for configuration actions (vtrefny) +- Allow changing format label using configuration actions (vtrefny) +- Add new actions for configuring formats and devices (vtrefny) +- Quickfix of merge bugs (japokorn) +- Remove action objects before resetting via dbus. (dlehman) +- Clean up dbus object management a bit. (dlehman) +- Only overwrite current format if the new one is different. (dlehman) +- Add a Factory method to DBusBlivet. (dlehman) +- Update example dbus client to account for Format interface. (dlehman) +- Adjust zanata version for new branch. (dlehman) +- Allow custom chunk size specification for MDRaidArrayDevice (vtrefny) +- Add zanata-python-client to TEST_DEPENDENCIES (bcl) +- Allow custom chunk size specification for MDRaidArrayDevice (vtrefny) +- Add zanata-python-client to TEST_DEPENDENCIES (bcl) +- Add a Commit method to DBusBlivet. (dlehman) +- Update unit tests. (dlehman) +- Move removed devices and formats into different subtrees. (dlehman) +- Use the object manager to look up objects. (dlehman) +- Add mappings of objects by id and object path to ObjectManager. (dlehman) +- Add an id property to DBusObject. (dlehman) +- Add an Action interface to the dbus service. (dlehman) +- Make sure DBusFormat's Type property is always a string. (dlehman) +- Pass blivet objects to blivet methods. (dlehman) +- Fix root detection on btrfs in rescue mode (vtrefny) +- Use device's mount options when mounting existing systems (vtrefny) +- Add a Commit method to DBusBlivet. (dlehman) +- Update unit tests. (dlehman) +- Move removed devices and formats into different subtrees. (dlehman) +- Use the object manager to look up objects. (dlehman) +- Add mappings of objects by id and object path to ObjectManager. (dlehman) +- Add an id property to DBusObject. (dlehman) +- Add an Action interface to the dbus service. (dlehman) +- Make sure DBusFormat's Type property is always a string. (dlehman) +- Pass blivet objects to blivet methods. (dlehman) +- Move some more installer-specific methods and values into blivet.osinstall. + (sbueno+anaconda) +- Mv copy_to_system from blivet.util to blivet.osinstall (sbueno+anaconda) +- Get rid of flags.installer_mode (sbueno+anaconda) +- Create flags.keep_empty_ext_partitions (sbueno+anaconda) +- Create flags.selinux_reset_fcon (sbueno+anaconda) +- Create flags.auto_dev_updates (sbueno+anaconda) +- Add a Format interface to the dbus service. (dlehman) +- Always require the rounding mode to be specified for Size (vpodzime) +- Add method DBusBlivet.InitializeDisk. (dlehman) +- Add a unit test for DBusBlivet.RemoveDevice. (dlehman) +- Maintain a mapping of object path to DBusDevice in DBusBlivet. (dlehman) +- Correctly handle failures in ResolveDevice. (dlehman) +- Add a RemoveDevice method to DBusBlivet. (dlehman) +- Convert event handling change accounting to use blivet callbacks. (dlehman) +- Add a set of callbacks for changes to blivet's view of things. (dlehman) +- Allow replacing an active format within blivet's model. (dlehman) +- Add the beginnings of an example client. (dlehman) +- Add a Device interface to the dbus service. (dlehman) +- Add an ObjectManager interface to the dbus service. (dlehman) +- Make DBusBlivet names more dbus-like. (dlehman) +- Clean up org.freedesktop.DBus.Properties code in DBusObject a bit. (dlehman) +- Move constants into a separate module. (dlehman) +- Convert some private methods to public properties. (dlehman) +- Import the whole dbus module in a couple of places. (dlehman) +- Add a minimal dbus interface. (dlehman) +- Rearrange the setup call to minimize changes on updates. (dlehman) +- Remove unused readthedocs code from setup.py. (dlehman) +- Ignore all merge commits when making rpm log. (dlehman) +- Isolate some boot device operations in blivet.partitioning. (sbueno+anaconda) +- Move bootloader stuff from Blivet to InstallerStorage. (sbueno+anaconda) +- Some small, stupid bugfixes to first installer isolation patch set. + (sbueno+anaconda) +- LVM data are now global (japokorn) +- Update api to reflect changes from isolating installer-specific code. + (sbueno+anaconda) +- Update examples and test cases for changes from isolating installer code. + (sbueno+anaconda) +- Get rid of blivet.blivet's last deps on blivet.osinstall (sbueno+anaconda) +- Get rid of blivet.blivet's dependence on blivet.osinstall.FSSet + (sbueno+anaconda) +- Mv installer-specific functions to install. Create InstallerStorage. + (sbueno+anaconda) +- Move StorageDiscoveryConfig from blivet.blivet to blivet.osinstall + (sbueno+anaconda) +- Move some StorageDiscoveryConfig attrs into Blivet. (sbueno+anaconda) +- Retrieve udev info as needed in handle_format. (dlehman) * Tue Sep 19 2017 Vojtech Trefny - 2.1.11-1 - Remove build requires for pocketlint (rkuska) diff --git a/sources b/sources index 5a7c7b3..844460e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blivet-2.1.11.tar.gz) = b5457f6d7ad8eb1088900c5f792dcb1bd86eee8df7b179a54c408c43570f54a76d4f24d1a510df08499beb3173b08be29adad7a7cf1072e2985c97bd5ff8720d +SHA512 (blivet-3.0.0.b1.tar.gz) = 398c55c7a45505aed538fe7503aabc904f1b7ef6a5b7f347e43dc75c35ab776923de015f8ebcafbd0a50357672928cca59e6a0673aec2a7d263adcd0ed984c74