From 73506f92fe846e9eed998e1691d8e7370e4d8593 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 18 Jan 2013 13:16:55 +0000
Subject: [PATCH] New upstream version 1.21.4.

- Add libguestfs-gobject-1.0.pc.
- Remove automake 1.13 hack, fixed upstream.
- Add explicit dependency on libcap, needed by the appliance.
---
 libguestfs.spec | 22 +++++++++++-----------
 sources         |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libguestfs.spec b/libguestfs.spec
index c02cd93..abe55b4 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -21,8 +21,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.21.3
-Release:       2%{?dist}
+Version:       1.21.4
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -113,6 +113,7 @@ BuildRequires: iputils
 BuildRequires: jfsutils
 BuildRequires: kernel
 BuildRequires: kmod
+BuildRequires: libcap
 BuildRequires: libldm
 BuildRequires: libselinux
 BuildRequires: libxml2
@@ -181,6 +182,7 @@ Requires:      iputils
 Requires:      jfsutils
 Requires:      kernel
 Requires:      kmod
+Requires:      libcap
 Requires:      libldm
 Requires:      libselinux
 Requires:      libxml2
@@ -674,17 +676,8 @@ if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
 fi
 
 %if 0%{?fedora} >= 17
-%if 0%{?fedora} >= 19
-# Very ugly workaround for a bug in automake 1.13.1:
-cp ocaml/Makefile.in ocaml/Makefile.in.bak
-%endif
 %patch1 -p1
 autoreconf -i
-%if 0%{?fedora} >= 19
-# Very ugly workaround for a bug in automake 1.13.1:
-cp ocaml/Makefile.in.bak ocaml/Makefile.in
-touch ocaml/Makefile.in
-%endif
 %endif
 
 mkdir -p daemon/m4
@@ -1014,6 +1007,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 %{_includedir}/guestfs-gobject/*.h
 %{_datadir}/gir-1.0/Guestfs-1.0.gir
 %{_datadir}/gtk-doc/html/guestfs
+%{_libdir}/pkgconfig/libguestfs-gobject-1.0.pc
 
 
 %files man-pages-ja
@@ -1027,6 +1021,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
+* Thu Jan 17 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.4-1
+- New upstream version 1.21.4.
+- Add libguestfs-gobject-1.0.pc.
+- Remove automake 1.13 hack, fixed upstream.
+- Add explicit dependency on libcap, needed by the appliance.
+
 * Thu Jan 17 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.3-2
 - New upstream version 1.21.3.
 
diff --git a/sources b/sources
index 92ca9c0..44cff5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-928f65f91eaa73897697d1963a737110  libguestfs-1.21.3.tar.gz
+8ea4ea22e531f46e30d29626b30c773a  libguestfs-1.21.4.tar.gz