From 8277b5df80077335b787f0283f659421709e7e1b Mon Sep 17 00:00:00 2001 From: Vratislav Podzimek Date: Wed, 11 Jan 2017 15:10:14 +0100 Subject: [PATCH] New version - Use the .in file as source when bumping version (vpodzime) - Run pylint based on the python version and make it optional (vpodzime) - Disable python3 and bcache on RHEL (vpodzime) - Make bcache support optional (vpodzime) - Teach boileplate_generator.py to skip things based on patterns (vpodzime) - Require lower versions of some utilities (vpodzime) - Do not require python3 for the boilerplate generation script (vpodzime) - Use a proper initialization value for 'GPollFD fds[2]' (vpodzime) - Deal with older parted and libblkid (vpodzime) - Make python3 and gtk-doc optional (vpodzime) - Bump the version of the utils library (vpodzime) - Fix docstring for 'bd_md_node_from_name' (vtrefny) - Add tests for added mdraid methods (vtrefny) - Skip 'MDTestNominateDenominateActive' unless feeling lucky (vtrefny) - MDRaid tests: change 'wait_for_resync' to wait for given action (vtrefny) - Add functionality need by storaged to mdraid plugin (vtrefny) - Move 'echo_str_to_file' method to utils (vtrefny) - Add a function to setup a loop device from a file descriptor (vpodzime) - Add functions to get/set the autoclear flag on a loop device (vpodzime) - Fix checking /proc/mdstat for resync action (vtrefny) - Adapt the test config files to version 2.x (vpodzime) --- .gitignore | 1 + libblockdev.spec | 61 ++++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 51 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 98533f2..0e316df 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /libblockdev-1.8.tar.gz /libblockdev-1.9.tar.gz /libblockdev-2.1.tar.gz +/libblockdev-2.2.tar.gz diff --git a/libblockdev.spec b/libblockdev.spec index bf5f1df..78da309 100644 --- a/libblockdev.spec +++ b/libblockdev.spec @@ -1,6 +1,18 @@ +%define with_python3 1 +%define with_gtk_doc 1 +%define with_bcache 1 + +%define is_rhel 0%{?rhel} != 0 + +# python3 is not available on RHEL +%if %{is_rhel} +%define with_python3 0 +%define configure_opts --without-python3 --without-bcache +%endif + Name: libblockdev -Version: 2.1 -Release: 3%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: A library for low-level manipulation with block devices License: LGPLv2+ URL: https://github.com/rhinstaller/libblockdev @@ -15,8 +27,12 @@ BuildRequires: dmraid-devel BuildRequires: volume_key-devel >= 0.3.9-7 BuildRequires: nss-devel BuildRequires: python-devel +%if %{with_python3} BuildRequires: python3-devel +%endif +%if %{with_gtk_doc} BuildRequires: gtk-doc +%endif BuildRequires: glib2-doc BuildRequires: kmod-devel BuildRequires: parted-devel @@ -63,6 +79,7 @@ Requires: pygobject3-base This package contains enhancements to the gobject-introspection bindings for libblockdev in Python2. +%if %{with_python3} %package -n python3-blockdev Summary: Python3 gobject-introspection bindings for libblockdev Requires: %{name}%{?_isa} = %{version}-%{release} @@ -72,6 +89,7 @@ Requires: python3-gobject-base %description -n python3-blockdev This package contains enhancements to the gobject-introspection bindings for libblockdev in Python3. +%endif %package utils Summary: A library with utility functions for the libblockdev library @@ -380,7 +398,7 @@ A meta-package that pulls all the libblockdev plugins as dependencies. %setup -q -n %{name}-%{version} %build -%configure +%configure %{?configure_opts} %{__make} %{?_smp_mflags} %install @@ -434,15 +452,19 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %{_includedir}/blockdev/blockdev.h %{_includedir}/blockdev/plugins.h %{_libdir}/pkgconfig/blockdev.pc +%if %{with_gtk_doc} %{_datadir}/gtk-doc/html/libblockdev +%endif %{_datadir}/gir*/BlockDev*.gir %files -n python2-blockdev %{python2_sitearch}/gi/overrides/* +%if %{with_python3} %files -n python3-blockdev %{python3_sitearch}/gi/overrides/BlockDev* %{python3_sitearch}/gi/overrides/__pycache__/BlockDev* +%endif %files utils %{_libdir}/libbd_utils.so.* @@ -578,11 +600,28 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %files plugins-all %changelog -* Mon Dec 12 2016 Charalampos Stratakis - 2.1-3 -- Rebuild for Python 3.6 - -* Tue Nov 15 2016 Vratislav Podzimek - 2.1-2 -- Rebuild for a chain-build with storaged (vpodzime) +* Wed Jan 11 2017 Vratislav Podzimek - 2.2-1 +- Use the .in file as source when bumping version (vpodzime) +- Run pylint based on the python version and make it optional (vpodzime) +- Disable python3 and bcache on RHEL (vpodzime) +- Make bcache support optional (vpodzime) +- Teach boileplate_generator.py to skip things based on patterns (vpodzime) +- Require lower versions of some utilities (vpodzime) +- Do not require python3 for the boilerplate generation script (vpodzime) +- Use a proper initialization value for 'GPollFD fds[2]' (vpodzime) +- Deal with older parted and libblkid (vpodzime) +- Make python3 and gtk-doc optional (vpodzime) +- Bump the version of the utils library (vpodzime) +- Fix docstring for 'bd_md_node_from_name' (vtrefny) +- Add tests for added mdraid methods (vtrefny) +- Skip 'MDTestNominateDenominateActive' unless feeling lucky (vtrefny) +- MDRaid tests: change 'wait_for_resync' to wait for given action (vtrefny) +- Add functionality need by storaged to mdraid plugin (vtrefny) +- Move 'echo_str_to_file' method to utils (vtrefny) +- Add a function to setup a loop device from a file descriptor (vpodzime) +- Add functions to get/set the autoclear flag on a loop device (vpodzime) +- Fix checking /proc/mdstat for resync action (vtrefny) +- Adapt the test config files to version 2.x (vpodzime) * Thu Nov 10 2016 Vratislav Podzimek - 2.1-1 - Do not require an exclusive lock on the device to commit part stuff (vpodzime) @@ -596,11 +635,9 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} - Trim the extra info for MD RAID's name (vpodzime) - Add xfsprogs and dosfstools as dependencies of the fs plugin (vpodzime) - Fix md_name_from_node to work with the "/dev/" prefix (vpodzime) -- New major upstream release -* Wed Nov 9 2016 Vratislav Podzimek - 1.9-8 -- Revert "Prevent issues between libparted and udev" (vpodzime) -- Revert "Open the device file as RDWR when committing parts" (vpodzime) +* Wed Nov 2 2016 Vratislav Podzimek - 2.0-1 +- New major upstream release * Thu Oct 27 2016 Vratislav Podzimek - 1.9-7 - Open the device file as RDWR when committing parts (vpodzime) diff --git a/sources b/sources index 93224f1..56e7f6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0bd637d4f56c20db914d55b186b23027 libblockdev-2.1.tar.gz +SHA512 (libblockdev-2.2.tar.gz) = 2133e98fa57bdb5a792753cc9461a1eb2db7e5083d2afd6aed0abba89941c44b297c98fb55d2bbc6064b65145a701ca7b010efabef48edd1b17fd06e69f1c0b9