From 6cc64de7b8c5f6687604bd6c313b7e265d509e7e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Wed, 15 Jul 2009 11:31:14 +0000
Subject: [PATCH] Fix runtime Requires so they use epoch correctly.

---
 libguestfs.spec | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/libguestfs.spec b/libguestfs.spec
index 4367b67..c253f8b 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.60
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -110,7 +110,7 @@ For Java bindings, see 'libguestfs-java-devel'.
 %package devel
 Summary:     Development tools and libraries for %{name}
 Group:       Development/Libraries
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    pkgconfig
 
 
@@ -123,7 +123,7 @@ for %{name}.
 Summary:     Shell for accessing and modifying virtual machine disk images
 Group:       Development/Tools
 License:     GPLv2+
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    /usr/bin/pod2text
 Requires:    virt-inspector
 
@@ -138,7 +138,7 @@ scripts.
 Summary:     Display OS version, kernel, drivers, etc in a virtual machine
 Group:       Development/Tools
 License:     GPLv2+
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    guestfish
 Requires:    perl-Sys-Virt
 
@@ -154,7 +154,7 @@ para-virtualized (PV), what applications are installed and more.
 Summary:     Display free space on virtual filesystems
 Group:       Development/Tools
 License:     GPLv2+
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    perl-Sys-Virt
 
 
@@ -171,7 +171,7 @@ also works for Windows virtual machines.
 %package -n ocaml-%{name}
 Summary:     OCaml bindings for %{name}
 Group:       Development/Libraries
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 
 
 %description -n ocaml-%{name}
@@ -184,7 +184,7 @@ programs which use %{name} you will also need ocaml-%{name}-devel.
 %package -n ocaml-%{name}-devel
 Summary:     OCaml bindings for %{name}
 Group:       Development/Libraries
-Requires:    ocaml-%{name} = %{version}-%{release}
+Requires:    ocaml-%{name} = %{epoch}:%{version}-%{release}
 
 
 %description -n ocaml-%{name}-devel
@@ -195,7 +195,7 @@ required to use the OCaml bindings for %{name}.
 %package -n perl-%{name}
 Summary:     Perl bindings for %{name}
 Group:       Development/Libraries
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
@@ -206,7 +206,7 @@ perl-%{name} contains Perl bindings for %{name}.
 %package -n python-%{name}
 Summary:     Python bindings for %{name}
 Group:       Development/Libraries
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -218,7 +218,7 @@ python-%{name} contains Python bindings for %{name}.
 %package -n ruby-%{name}
 Summary:     Ruby bindings for %{name}
 Group:       Development/Libraries
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    ruby(abi) = 1.8
 Provides:    ruby(guestfs) = %{version}
 
@@ -232,7 +232,7 @@ ruby-%{name} contains Ruby bindings for %{name}.
 %package java
 Summary:     Java bindings for %{name}
 Group:       Development/Libraries
-Requires:    %{name} = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    java >= 1.5.0
 Requires:    jpackage-utils
 
@@ -246,8 +246,8 @@ you will also need %{name}-java-devel.
 %package java-devel
 Summary:     Java development package for %{name}
 Group:       Development/Libraries
-Requires:    %{name} = %{version}-%{release}
-Requires:    %{name}-java = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
+Requires:    %{name}-java = %{epoch}:%{version}-%{release}
 
 %description java-devel
 %{name}-java-devel contains the tools for developing Java software
@@ -259,8 +259,8 @@ See also %{name}-javadoc.
 %package javadoc
 Summary:     Java documentation for %{name}
 Group:       Development/Libraries
-Requires:    %{name} = %{version}-%{release}
-Requires:    %{name}-java = %{version}-%{release}
+Requires:    %{name} = %{epoch}:%{version}-%{release}
+Requires:    %{name}-java = %{epoch}:%{version}-%{release}
 Requires:    jpackage-utils
 
 %description javadoc
@@ -525,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.60-2
+- Fix runtime Requires so they use epoch correctly.
+
 * Tue Jul 14 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.60-1
 - New upstream release 1.0.60.