From 64690cd4488ec70119f468cc4977f8c9fcfdce8e Mon Sep 17 00:00:00 2001 From: Vratislav Podzimek Date: Tue, 27 Oct 2015 06:36:16 +0100 Subject: [PATCH] New version - Add missing python GI requires (vpodzime) - Merge pull request #49 from dashea/libblockdev-python (vpodzime) - Merge pull request #50 from vpodzime/master-fix_striped_lv (vpodzime) - Merge pull request #46 from vpodzime/master-bcache_destroy (vpodzime) - Merge pull request #39 from vpodzime/master-lvm_physical_space (vpodzime) - Add a missing ldconfig that rpmlint found. (dshea) - Move python files to separate packages (#1256758) (dshea) - Fix lvcreate calls for striped LVs (vpodzime) - Merge pull request #48 from vojtechtrefny/master_pvfree (vpodzime) - Add pv_free to BDLVMPVdata (vtrefny) - Merge pull request #47 from atodorov/add_coverage_report (vpodzime) - Produce coverage report in CI (atodorov) - Check bcache device's state before trying to detach the cache in destroy() (vpodzime) - Fix URLs in the spec (vpodzime) - Fix the int-float less-than comparison (vpodzime) - Fix the calculation of physical space taken by an LV (vpodzime) --- .gitignore | 1 + libblockdev.spec | 63 ++++++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 50 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 35e18ae..8991e6b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /libblockdev-1.0.tar.gz /libblockdev-1.1.tar.gz /libblockdev-1.2.tar.gz +/libblockdev-1.3.tar.gz diff --git a/libblockdev.spec b/libblockdev.spec index d6f8d75..db01ce5 100644 --- a/libblockdev.spec +++ b/libblockdev.spec @@ -1,12 +1,11 @@ Name: libblockdev -Version: 1.2 +Version: 1.3 Release: 1%{?dist} Summary: A library for low-level manipulation with block devices License: LGPLv2+ -URL: https://github.com/vpodzime/libblockdev -Source0: https://github.com/vpodzime/libblockdev/archive/%{name}-%{version}.tar.gz +URL: https://github.com/rhinstaller/libblockdev +Source0: https://github.com/rhinstaller/libblockdev/archive/%{name}-%{version}.tar.gz -BuildRequires: scons BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: cryptsetup-devel @@ -33,14 +32,6 @@ BuildRequires: kmod-devel BuildRequires: s390utils-devel %endif -# Do not check the python directories for automatic Requires -# The python gi.overrides files automatically add python(abi) entries to -# the rpm Requires, but this is backwards. Anything using libblockdev from -# python will require python, but libblockdev will work just fine without -# python. -%global __requires_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/gi/overrides/.*$ - - %description The libblockdev is a C library with GObject introspection support that can be used for doing low-level operations with block devices like setting up LVM, @@ -59,6 +50,25 @@ Requires: glib2-devel This package contains header files and pkg-config files needed for development with the libblockdev library. +%package -n python2-blockdev +Summary: Python2 gobject-introspection bindings for libblockdev +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pygobject3-base +%{?python_provide:%python_provide python2-blockdev} + +%description -n python2-blockdev +This package contains enhancements to the gobject-introspection bindings for +libblockdev in Python2. + +%package -n python3-blockdev +Summary: Python3 gobject-introspection bindings for libblockdev +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python3-gobject +%{?python_provide:%python_provide python3-blockdev} + +%description -n python3-blockdev +This package contains enhancements to the gobject-introspection bindings for +libblockdev in Python3. %package utils Summary: A library with utility functions for the libblockdev library @@ -332,6 +342,8 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %postun swap -p /sbin/ldconfig %post s390 -p /sbin/ldconfig %postun s390 -p /sbin/ldconfig +%post kbd -p /sbin/ldconfig +%postun kbd -p /sbin/ldconfig %files @@ -340,9 +352,6 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %{_libdir}/libblockdev.so.* %{_libdir}/girepository*/BlockDev*.typelib %config %{_sysconfdir}/libblockdev/conf.d/00-default.cfg -%{python2_sitearch}/gi/overrides/* -%{python3_sitearch}/gi/overrides/BlockDev* -%{python3_sitearch}/gi/overrides/__pycache__/BlockDev* %files devel %doc features.rst specs.rst @@ -354,6 +363,12 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %{_datadir}/gtk-doc/html/libblockdev %{_datadir}/gir*/BlockDev*.gir +%files -n python2-blockdev +%{python2_sitearch}/gi/overrides/* + +%files -n python3-blockdev +%{python3_sitearch}/gi/overrides/BlockDev* +%{python3_sitearch}/gi/overrides/__pycache__/BlockDev* %files utils %{_libdir}/libbd_utils.so.* @@ -459,6 +474,24 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %files plugins-all %changelog +* Mon Oct 26 2015 Vratislav Podzimek - 1.3-1 +- Add missing python GI requires (vpodzime) +- Merge pull request #49 from dashea/libblockdev-python (vpodzime) +- Merge pull request #50 from vpodzime/master-fix_striped_lv (vpodzime) +- Merge pull request #46 from vpodzime/master-bcache_destroy (vpodzime) +- Merge pull request #39 from vpodzime/master-lvm_physical_space (vpodzime) +- Add a missing ldconfig that rpmlint found. (dshea) +- Move python files to separate packages (#1256758) (dshea) +- Fix lvcreate calls for striped LVs (vpodzime) +- Merge pull request #48 from vojtechtrefny/master_pvfree (vpodzime) +- Add pv_free to BDLVMPVdata (vtrefny) +- Merge pull request #47 from atodorov/add_coverage_report (vpodzime) +- Produce coverage report in CI (atodorov) +- Check bcache device's state before trying to detach the cache in destroy() (vpodzime) +- Fix URLs in the spec (vpodzime) +- Fix the int-float less-than comparison (vpodzime) +- Fix the calculation of physical space taken by an LV (vpodzime) + * Wed Sep 23 2015 Vratislav Podzimek - 1.2-1 - Merge pull request #40 from vpodzime/master-config_support (vpodzime) - Add tests for configuration support (vpodzime) diff --git a/sources b/sources index 6961494..0c80425 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2554e88c3c3198a566f8e375eb5c4bc4 libblockdev-1.2.tar.gz +18f4dad9ff47752e4da29a86b7dffc1b libblockdev-1.3.tar.gz