From 515c974629c7f61b9bc60e089f28d12e2dfb2106 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:17:47 +0000 Subject: import perl-Sys-Virt-3.9.0-2.el7 --- diff --git a/.gitignore b/.gitignore index 18661b1..6dce6ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/Sys-Virt-3.2.0.tar.gz +SOURCES/Sys-Virt-3.9.0.tar.gz diff --git a/.perl-Sys-Virt.metadata b/.perl-Sys-Virt.metadata index 5ac733e..ad40ac8 100644 --- a/.perl-Sys-Virt.metadata +++ b/.perl-Sys-Virt.metadata @@ -1 +1 @@ -be828ba05fbbf678a00052e8cc667cf9546f1ab0 SOURCES/Sys-Virt-3.2.0.tar.gz +b8b4d64f8e0864af012a962651a1450d63920f3c SOURCES/Sys-Virt-3.9.0.tar.gz diff --git a/SOURCES/0001-Fix-location-of-lifecycle-constants.patch b/SOURCES/0001-Fix-location-of-lifecycle-constants.patch new file mode 100644 index 0000000..493b71e --- /dev/null +++ b/SOURCES/0001-Fix-location-of-lifecycle-constants.patch @@ -0,0 +1,59 @@ +From 22cba90fe483b4ac7c63d028355ed4bea3b624ae Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Tue, 21 Nov 2017 09:25:00 +0000 +Subject: [PATCH] Fix location of lifecycle constants + +The lifecycle constants recently added were placed in the wrong +namespace. The perl binding doesn't define separate namespaces +for each enum, rather they constants are all under the namespace +of the object they are associated with ie Sys::Virt::Domain +in this case. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit c64d98dad1af16b2d8eb5cbfd0ed50d81eb7f4d7) +--- + Virt.xs | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +diff --git a/Virt.xs b/Virt.xs +index c123769..415eb8a 100644 +--- a/Virt.xs ++++ b/Virt.xs +@@ -9069,6 +9069,17 @@ BOOT: + REGISTER_CONSTANT(VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_REVERT, JOB_OPERATION_SNAPSHOT_REVERT); + REGISTER_CONSTANT(VIR_DOMAIN_JOB_OPERATION_DUMP, JOB_OPERATION_DUMP); + ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_POWEROFF, LIFECYCLE_POWEROFF); ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_REBOOT, LIFECYCLE_REBOOT); ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_CRASH, LIFECYCLE_CRASH); ++ ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY, LIFECYCLE_ACTION_DESTROY); ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_RESTART, LIFECYCLE_ACTION_RESTART); ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME, LIFECYCLE_ACTION_RESTART_RENAME); ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE, LIFECYCLE_ACTION_PRESERVE); ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY, LIFECYCLE_ACTION_COREDUMP_DESTROY); ++ REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART, LIFECYCLE_ACTION_COREDUMP_RESTART); ++ + stash = gv_stashpv( "Sys::Virt::DomainSnapshot", TRUE ); + REGISTER_CONSTANT(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN, DELETE_CHILDREN); + REGISTER_CONSTANT(VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY, DELETE_METADATA_ONLY); +@@ -9101,19 +9112,6 @@ BOOT: + REGISTER_CONSTANT(VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED, REVERT_PAUSED); + REGISTER_CONSTANT(VIR_DOMAIN_SNAPSHOT_REVERT_FORCE, REVERT_FORCE); + +- stash = gv_stashpv( "Sys::Virt::Lifecycle", TRUE ); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_POWEROFF, LIFECYCLE_POWEROFF); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_REBOOT, LIFECYCLE_REBOOT); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_CRASH, LIFECYCLE_CRASH); +- +- stash = gv_stashpv( "Sys::Virt::LifecycleAction", TRUE ); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY, LIFECYCLE_ACTION_DESTROY); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_RESTART, LIFECYCLE_ACTION_RESTART); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME, LIFECYCLE_ACTION_RESTART_RENAME); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE, LIFECYCLE_ACTION_PRESERVE); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY, LIFECYCLE_ACTION_COREDUMP_DESTROY); +- REGISTER_CONSTANT(VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART, LIFECYCLE_ACTION_COREDUMP_RESTART); +- + stash = gv_stashpv( "Sys::Virt::StoragePool", TRUE ); + REGISTER_CONSTANT(VIR_STORAGE_POOL_INACTIVE, STATE_INACTIVE); + REGISTER_CONSTANT(VIR_STORAGE_POOL_BUILDING, STATE_BUILDING); diff --git a/SPECS/perl-Sys-Virt.spec b/SPECS/perl-Sys-Virt.spec index 5c3ae8c..76e1f7b 100644 --- a/SPECS/perl-Sys-Virt.spec +++ b/SPECS/perl-Sys-Virt.spec @@ -1,10 +1,11 @@ Name: perl-Sys-Virt -Version: 3.2.0 -Release: 1%{?dist} +Version: 3.9.0 +Release: 2%{?dist} Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic URL: http://search.cpan.org/dist/Sys-Virt/ Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{version}.tar.gz +Patch1: 0001-Fix-location-of-lifecycle-constants.patch # Build BuildRequires: coreutils BuildRequires: findutils @@ -38,6 +39,7 @@ virtualization containers to be managed with a consistent API. %prep %setup -q -n Sys-Virt-%{version} +%patch1 -p1 sed -i -e '/Sys-Virt\.spec/d' Makefile.PL sed -i -e '/\.spec\.PL$/d' MANIFEST rm -f *.spec.PL @@ -62,6 +64,15 @@ make test %{_mandir}/man3/* %changelog +* Thu Nov 30 2017 Daniel P. Berrange - 3.9.0-2 +- Fix package placement of lifecycle constants (rhbz #1515722) + +* Mon Nov 6 2017 Daniel P. Berrange - 3.9.0-1 +- Rebase to 3.9.0 release (rhbz #1472268) + +* Tue Sep 5 2017 Daniel P. Berrange - 3.7.0-1 +- Rebase to 3.7.0 release (rhbz #1472268) + * Mon Apr 3 2017 Daniel P. Berrange - 3.2.0-1 - Rebase to 3.2.0 release (rhbz #1382643)