From 8deec0c7766453f9a5c87c341e62b479673b25f68cc148eedbcfbf2f7b7fa490 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Fri, 23 Nov 2012 16:48:22 +0000
Subject: [PATCH] - include Pod-Simple-3.23.tar.gz to get
 perl(Pod::Simple::XHTML)   at build time (bnc#789653) - Update to version
 1.19.62 (fate#312159) - Update to version 1.19.61

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=162
---
 Pod-Simple-3.23.tar.gz    |  3 +++
 libguestfs-1.19.61.tar.gz |  3 ---
 libguestfs-1.19.62.tar.gz |  3 +++
 libguestfs.changes        |  9 ++++++++-
 libguestfs.spec           | 10 +++++-----
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 Pod-Simple-3.23.tar.gz
 delete mode 100644 libguestfs-1.19.61.tar.gz
 create mode 100644 libguestfs-1.19.62.tar.gz

diff --git a/Pod-Simple-3.23.tar.gz b/Pod-Simple-3.23.tar.gz
new file mode 100644
index 0000000..0e83c99
--- /dev/null
+++ b/Pod-Simple-3.23.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:683fb6b312f993f42a9ff7f686d816fe7486e2e34fcfbcc3f01ab76e05c5f61e
+size 239245
diff --git a/libguestfs-1.19.61.tar.gz b/libguestfs-1.19.61.tar.gz
deleted file mode 100644
index 42206af..0000000
--- a/libguestfs-1.19.61.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0104d0e4d90d165c27ab6a8baedf2ac177479d8d378428b54fd12e2881f4ad0a
-size 8950659
diff --git a/libguestfs-1.19.62.tar.gz b/libguestfs-1.19.62.tar.gz
new file mode 100644
index 0000000..5a2cab5
--- /dev/null
+++ b/libguestfs-1.19.62.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:632b20cf2ef8635ff9c275f9728a7164c3363feb47d0f9bdcceba524653f9fd6
+size 8986639
diff --git a/libguestfs.changes b/libguestfs.changes
index d2672b9..69ae9a0 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 23 17:37:54 CET 2012 - ohering@suse.de
+
+- include Pod-Simple-3.23.tar.gz to get perl(Pod::Simple::XHTML)
+  at build time (bnc#789653)
+- Update to version 1.19.62 (fate#312159)
+
 -------------------------------------------------------------------
 Mon Nov 19 18:26:16 CET 2012 - ohering@suse.de
 
@@ -8,7 +15,7 @@ Mon Nov 19 18:26:16 CET 2012 - ohering@suse.de
 -------------------------------------------------------------------
 Mon Nov 19 17:24:19 CET 2012 - ohering@suse.de
 
-- Update to version 1.19.61 (fate#312159)
+- Update to version 1.19.61
   new subpackage lua-libguestfs, disabled for sles11
 
 -------------------------------------------------------------------
diff --git a/libguestfs.spec b/libguestfs.spec
index 3bbaae9..222afd4 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -73,9 +73,6 @@ BuildRequires:  ncurses-devel
 BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
-# perl as included in openSuSE 11.4 has this, but an older version without html_charset
-# perl as included in openSuSE 12.1 includes 3.16, so require at least this version
-BuildRequires:  perl(Pod::Simple::XHTML) >= 3.16
 #
 %if %{with_ocaml_bindings}
 %define with_ocaml_tools 1
@@ -101,11 +98,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Compatibility package for guestfs-tools
 License:        GPL-2
 Group:          System/Filesystems
-Version:        1.19.61
+Version:        1.19.62
 Release:        0
 Patch5:         libguestfs-1.13.14-ruby.patch
 Patch1000:      1000-force-virtio_blk-in-old-guest-kernel.patch
 Source0:        %{name}-%{version}.tar.gz
+Source789653:   Pod-Simple-3.23.tar.gz
 Source10:       libguestfs.mkinitrd.boot.sh
 Source11:       libguestfs.mkinitrd.setup.sh
 Source1220:     libguestfs.mkinitrd.1220.patch
@@ -367,11 +365,13 @@ virtual machines.
 
 
 %prep
-%setup -q
+%setup -q -a 789653
 %patch5 -p1
 %patch1000 -p1
 
 %build
+# [Bug 789653] sles11 perl obsoletes perl-Pod-Simple unconditionally
+export PERLLIB=`echo $PWD/Pod-Simple-*/lib`
 # disable qemu test.
 # If the package is built within kvm the configure test will fail because it starts kvm within kvm
 # With QEMU in environment qemu and kvm packages are not needed at build time.