diff --git a/.gitignore b/.gitignore index 2217ee0..05ce236 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /blivet-1.0.tar.gz /blivet-1.1.tar.gz /blivet-1.2.tar.gz +/blivet-1.3.tar.gz diff --git a/python-blivet.spec b/python-blivet.spec index 3444510..eeaaba8 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -1,27 +1,32 @@ Summary: A python module for system storage configuration Name: python-blivet Url: http://fedoraproject.org/wiki/blivet -Version: 1.2 +Version: 1.3 Release: 1%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries %define realname blivet Source0: http://github.com/dwlehman/blivet/archive/%{realname}-%{version}.tar.gz +%global with_python3 1 # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). %define pykickstartver 1.99.22 %define partedver 1.8.1 -%define pypartedver 2.5-2 +%define pypartedver 3.10.3 %define e2fsver 1.41.0 %define utillinuxver 2.15.1 -%define libblockdevver 0.6 +%define libblockdevver 0.10 BuildArch: noarch BuildRequires: gettext BuildRequires: python-setuptools +%if 0%{with_python3} +BuildRequires: python3-devel python3-setuptools +%endif + Requires: python Requires: python-six Requires: python-kickstart >= %{pykickstartver} @@ -32,16 +37,45 @@ Requires: pyparted >= %{pypartedver} Requires: dosfstools Requires: e2fsprogs >= %{e2fsver} Requires: lsof +Requires: libselinux-python Requires: libblockdev >= %{libblockdevver} Requires: libblockdev-plugins-all >= %{libblockdevver} +Requires: libselinux-python %description The python-blivet package is a python module for examining and modifying storage configuration. +%if 0%{with_python3} +%package -n python3-%{realname} +Summary: A python3 package for examining and modifying storage configuration. +Requires: python3 +Requires: python3-six +Requires: python3-kickstart +Requires: python3-pyudev +Requires: parted >= %{partedver} +Requires: python3-pyparted >= %{pypartedver} +Requires: libselinux-python3 +Requires: libblockdev >= %{libblockdevver} +Requires: libblockdev-plugins-all >= %{libblockdevver} +Requires: util-linux >= %{utillinuxver} +Requires: dosfstools +Requires: e2fsprogs >= %{e2fsver} +Requires: lsof + +%description -n python3-%{realname} +The python3-%{realname} is a python3 package for examining and modifying storage +configuration. +%endif + %prep %setup -q -n %{realname}-%{version} +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif + %build make @@ -50,13 +84,101 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install %find_lang %{realname} +%if 0%{?with_python3} +pushd %{py3dir} +make PYTHON=%{__python3} DESTDIR=%{buildroot} install +popd +%endif + %files -f %{realname}.lang %defattr(-,root,root,-) %license COPYING %doc README ChangeLog examples %{python_sitelib}/* +%if 0%{?with_python3} +%files -n python3-%{realname} +%license COPYING +%doc README ChangeLog examples +%{python3_sitelib}/* +%endif + %changelog +* Wed Apr 22 2015 Brian C. Lane - 1.3-1 +- fix conf.py pylint errors (bcl) +- Fix BlockDev import in populator.py (bcl) +- Prevent pylint from going crazy because of libblockdev's ErrorProxy + (vpodzime) +- Make use of the new libblockdev error reporting (vpodzime) +- Add libselinux-python to package dependencies (#1211834) (vtrefny) +- Introduce a new doReqPartition method that is similar to doAutoPartition. + (clumens) +- Merge pull request #81 from mulkieran/master-mount-options (mulkieran) +- Merge pull request #66 from vpodzime/master-py3_final (martin.kolman) +- Encode input for os.write() (mkolman) +- Build the python3-blivet subpackage (vpodzime) +- Do not modify dict while iterating over its values (vpodzime) +- Do not try to compare strings and Nones when sorting mountpoints (vpodzime) +- Always return strings from regular capture output run functions (mkolman) +- Do not use variable from an inner comprehension in tests (vpodzime) +- Implement and test Python 3 division for the Size class (vpodzime) +- Replace python 2 build-in-function cmp() with custom method (vtrefny) +- Do not rely on __sub__ being implemented as __add__ (-1)* (vpodzime) +- Transform our compare functions into key functions and use these instead + (vpodzime) +- Fix the size_test to stop using byte strings (vpodzime) +- Do not define unit strings as byte strings (vpodzime) +- Do not pass context to Decimal numeric operations (vpodzime) +- Don't call object's (as a class) __new__ with extra arguments (vpodzime) +- Make translation to lowerASCII Python[23]-compatible (vpodzime) +- Replace __import__ call with importlib.import_module (vpodzime) +- In FS._postSetup() check the mountpoint options that were actually used. + (amulhern) +- Add kwargs to unmount and move mountpoint check into _preSetup (bcl) +- Do not try importing hidden/backup files as formats (vpodzime) +- Add back DeviceTree's support for saving LUKS passphrases (vpodzime) +- Do not try to stat FileDevice's path if it doesn't exist (vpodzime) +- Merge pull request #76 from dwlehman/unusable-storage-branch (dlehman) +- Add error handling around storageInitialize for unusable setups. (dlehman) +- Include suggestions in error classes for unusable storage configurations. + (dlehman) +- Use partially corrupt gpt disklabels. (dlehman) +- Consolidate common code in DeviceFormat class methods. (dlehman) +- Update get_mount_paths to use mountsCache (bcl) +- Add multiple mountpoint handling to MountsCache (bcl) +- Remove obsolete FIXME from FS.status (bcl) +- Check to see if mountpoint is already mounted (bcl) +- Add isMountpoint to MountsCache (bcl) +- Add ability to unmount specific mountpoints (bcl) +- Fix pylint errors for six.moves import (vtrefny) +- Merge pull request #72 from vojtechtrefny/picklable-size (vpodzime) +- Merge pull request #74 from mulkieran/master-trivia (mulkieran) +- Fix two instances where check_equal() returned True incorrectly. (amulhern) +- Fix typo in 66f2ddb11e85ec6f48535d670dd6f24cb60cbe55. (amulhern) +- Make sure installer_mode is reset to original value. (amulhern) +- Test for Size pickling support (vtrefny) +- Pickling support for Size. (vtrefny) +- Disable pylint bad-super-call in MDRaidArrayDevice.updateSize. (dlehman) +- Merge pull request #68 from dwlehman/parted-device-branch (dlehman) +- Require reallocation after changing an allocated partition's size. (dlehman) +- Move mediaPresent out of Device and into StorageDevice. (dlehman) +- Don't use parted.Device to obtain size info. (dlehman) +- Merge pull request #70 from mulkieran/master-1208536 (mulkieran) +- Prepend /sys to sysfs path for udev lookup (#1208536) (amulhern) +- Fall back on mdadm info if udev info is missing for the array (#1208536) + (amulhern) +- Catch DeviceError as well as ValueError (#1208536) (amulhern) +- Make an MDContainerDevice if that is the right model (#1208536) (amulhern) +- Change raid variable name to raid_items (#1208536) (amulhern) +- Fix swapped args to processActions. (dlehman) +- Merge pull request #63 from dwlehman/disk-selection-branch (dlehman) +- Use VGname-LVname as key for LVinfo cache (vpodzime) +- Add back DeviceTree's methods and properties used from the outside (vpodzime) +- Wrap keys() with a list so that the dictionary can be changed (martin.kolman) +- Add a method to list disks related by lvm/md/btrfs container membership. + (dlehman) +- Make getDependentDevices work with hidden devices. (dlehman) + * Fri Mar 27 2015 Brian C. Lane - 1.2-1 - Fix pylint unused variable warnings (vtrefny) - Add test for mountpoints (vtrefny) diff --git a/sources b/sources index dd1a87b..186ace4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3005820ec5fd0b12dd4f49e0b856787 blivet-1.2.tar.gz +6911d2f9507f28721389696a99c4bb01 blivet-1.3.tar.gz