From e61741b6b11738aa7ced28388d1fb6976306e79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 27 Jun 2014 17:28:39 +0200 Subject: [PATCH] Fix license metadata --- ...-The-license-metadata-must-be-a-list.patch | 34 +++++++++++++++++++ virt-v2v.spec | 9 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 virt-v2v-v0.9.1-The-license-metadata-must-be-a-list.patch diff --git a/virt-v2v-v0.9.1-The-license-metadata-must-be-a-list.patch b/virt-v2v-v0.9.1-The-license-metadata-must-be-a-list.patch new file mode 100644 index 0000000..2feb69f --- /dev/null +++ b/virt-v2v-v0.9.1-The-license-metadata-must-be-a-list.patch @@ -0,0 +1,34 @@ +From 6ea7529da49959ff164f39eae4423fdc730f9753 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 27 Jun 2014 17:20:00 +0200 +Subject: [PATCH] The license metadata must be a list +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +CPAN::Meta::Spec defines the license value must be an array reference. +However current Build.PL uses simple scalar. This breaks generating +META.* files which breaks tests with recent Module::Build 0.4205. + +https://bugzilla.redhat.com/show_bug.cgi?id=1083430 +Signed-off-by: Petr Písař +--- + Build.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Build.PL b/Build.PL +index 55cee55..0ccace3 100644 +--- a/Build.PL ++++ b/Build.PL +@@ -316,7 +316,7 @@ my $build = $class->new ( + script_files => [ 'v2v/virt-v2v.pl', 'p2v/server/virt-p2v-server.pl' ], + meta_add => { + resources => { +- license => "http://www.gnu.org/licenses/gpl.html", ++ license => [ "http://www.gnu.org/licenses/gpl.html" ], + homepage => "http://people.redhat.com/mbooth/virt-v2v/", + repository => "git://git.fedorahosted.org/virt-v2v.git", + MailingList => "http://www.redhat.com/mailman/listinfo/libguestfs", +-- +1.9.3 + diff --git a/virt-v2v.spec b/virt-v2v.spec index e809ea3..57c9d17 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -1,6 +1,6 @@ Name: virt-v2v Version: 0.9.0 -Release: 6%{?dist}%{?extra_release} +Release: 7%{?dist}%{?extra_release} Summary: Convert a virtual machine to run on KVM License: GPLv2+ and LGPLv2+ @@ -12,6 +12,9 @@ Source0: https://fedorahosted.org/releases/v/i/virt-v2v/%{name}-v%{versio # for Fedora >= 18. Patch1: virt-v2v-use-appliance-backend.patch +# Fix license metadata, bug #1083430 +Patch2: virt-v2v-v0.9.1-The-license-metadata-must-be-a-list.patch + # Unfortunately, despite really being noarch, we have to make virt-v2v arch # dependent to avoid build failures on architectures where libguestfs isn't # available. @@ -91,6 +94,7 @@ variety of guest operating systems from libvirt-managed hosts and VMware ESX. %setup -q -n %{name}-v%{version} %patch1 -p1 +%patch2 -p1 %build @@ -160,6 +164,9 @@ cp v2v/virt-v2v.db $statedir/ %changelog +* Fri Jun 27 2014 Petr Pisar - 0.9.0-7 +- Fix license metadata (bug #1083430) + * Sun Jun 08 2014 Fedora Release Engineering - 0.9.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild