diff --git a/.gitignore b/.gitignore index 459752f..5f66de3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libvirt-python-2.0.0.tar.gz +SOURCES/libvirt-python-3.2.0.tar.gz diff --git a/.libvirt-python.metadata b/.libvirt-python.metadata index c44c67d..dd9d5cb 100644 --- a/.libvirt-python.metadata +++ b/.libvirt-python.metadata @@ -1 +1 @@ -dde6d4cdd5fbf02c4d468654c90c043a7c29c5a5 SOURCES/libvirt-python-2.0.0.tar.gz +ff5e311239854d4e679dd01b6b7db3266e4c1136 SOURCES/libvirt-python-3.2.0.tar.gz diff --git a/SOURCES/libvirt-python-Fix-crash-in-storage-pool-refresh-callback.patch b/SOURCES/libvirt-python-Fix-crash-in-storage-pool-refresh-callback.patch deleted file mode 100644 index be1ab61..0000000 --- a/SOURCES/libvirt-python-Fix-crash-in-storage-pool-refresh-callback.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c3e600b430787105f135e148aaca9b0b481dbfa3 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Pavel Hrdina -Date: Mon, 25 Jul 2016 10:27:18 +0200 -Subject: [PATCH] Fix crash in storage pool refresh callback - -Fixes copy-paste typo introduced by commit cb84e36c. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1354271 - -Signed-off-by: Pavel Hrdina -(cherry picked from commit a3a4425338017ecefd31b969f62a1b5803f92a5c) -Signed-off-by: Pavel Hrdina ---- - examples/event-test.py | 2 +- - libvirt-override.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/examples/event-test.py b/examples/event-test.py -index f0341b5..1bcea07 100755 ---- a/examples/event-test.py -+++ b/examples/event-test.py -@@ -580,7 +580,7 @@ def myStoragePoolEventLifecycleCallback(conn, pool, event, detail, opaque): - storageEventToString(event), - detail)) - --def myStoragePoolEventRefreshCallback(conn, pool, event, detail, opaque): -+def myStoragePoolEventRefreshCallback(conn, pool, opaque): - print("myStoragePoolEventRefreshCallback: Storage pool %s" % pool.name()) - - ########################################################################## -diff --git a/libvirt-override.c b/libvirt-override.c -index 8f21cfd..72b4b6b 100644 ---- a/libvirt-override.c -+++ b/libvirt-override.c -@@ -8862,7 +8862,7 @@ libvirt_virConnectStoragePoolEventGenericCallback(virConnectPtr conn ATTRIBUTE_U - /* Call the Callback Dispatcher */ - pyobj_ret = PyObject_CallMethod(pyobj_conn, - (char*)"_dispatchStoragePoolEventGenericCallback", -- (char*)"OiiO", -+ (char*)"OO", - pyobj_pool, - pyobj_cbData); - --- -2.9.2 - diff --git a/SPECS/libvirt-python.spec b/SPECS/libvirt-python.spec index c30f7d7..bb8774d 100644 --- a/SPECS/libvirt-python.spec +++ b/SPECS/libvirt-python.spec @@ -6,17 +6,14 @@ Summary: The libvirt virtualization API python2 binding Name: libvirt-python -Version: 2.0.0 -Release: 2%{?dist}%{?extra_release} +Version: 3.2.0 +Release: 3%{?dist}%{?extra_release} Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz - -Patch1: libvirt-python-Fix-crash-in-storage-pool-refresh-callback.patch - Url: http://libvirt.org License: LGPLv2+ Group: Development/Libraries BuildRequires: git -BuildRequires: libvirt-devel >= 2.0.0-3%{?dist} +BuildRequires: libvirt-devel >= 3.2.0-9%{?dist} BuildRequires: python-devel BuildRequires: python-nose BuildRequires: python-lxml @@ -58,42 +55,6 @@ of recent versions of Linux (and other OSes). # for the -python3 package find examples -type f -exec chmod 0644 \{\} \; -# Patches have to be stored in a temporary file because RPM has -# a limit on the length of the result of any macro expansion; -# if the string is longer, it's silently cropped -%{lua: - tmp = os.tmpname(); - f = io.open(tmp, "w+"); - count = 0; - for i, p in ipairs(patches) do - f:write(p.."\n"); - count = count + 1; - end; - f:close(); - print("PATCHCOUNT="..count.."\n") - print("PATCHLIST="..tmp.."\n") -} - -git init -q -git config user.name rpm-build -git config user.email rpm-build -git config gc.auto 0 -git add . -git commit -q -a --author 'rpm-build ' \ - -m '%{name}-%{version} base' - -COUNT=$(grep '\.patch$' $PATCHLIST | wc -l) -if [ $COUNT -ne $PATCHCOUNT ]; then - echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT" - exit 1 -fi -if [ $COUNT -gt 0 ]; then - xargs git am <$PATCHLIST || exit 1 -fi -echo "Applied $COUNT patches" -rm -f $PATCHLIST - - %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %if %{with_python3} @@ -135,6 +96,26 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info %endif %changelog +* Wed Jun 7 2017 Jiri Denemark - 3.2.0-3 +- rebuild libvirt-python to pickup new flag for virDomainBlockCopy (rhbz#1459183) + +* Wed May 3 2017 Jiri Denemark - 3.2.0-2 +- Rebuild libvirt-python (rhbz#1382642) + +* Mon Apr 3 2017 Jiri Denemark - 3.2.0-1 +- Rebased to libvirt-python-3.2.0 (rhbz#1382642) + +* Fri Mar 3 2017 Jiri Denemark - 3.1.0-1 +- Rebased to libvirt-python-3.1.0 (rhbz#1382642) + +* Tue Feb 7 2017 Jiri Denemark - 3.0.0-1 +- Rebased to libvirt-python-3.0.0 (rhbz#1382642) + +* Tue Dec 6 2016 Jiri Denemark - 2.5.0-1 +- Rebased to libvirt-python-2.5.0 (rhbz#1382642) +- The rebase also fixes the following bugs: + rhbz#1377071 + * Mon Aug 1 2016 Jiri Denemark - 2.0.0-2 - Fix crash in storage pool refresh callback (rhbz#1354271)