diff --git a/0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch b/0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch index 7c3e5d2..7e66de2 100644 --- a/0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch +++ b/0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch @@ -1,7 +1,7 @@ From a4e27cdf4d3b831792dd20d796dc98a5bc684290 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 29 Oct 2009 17:54:48 +0000 -Subject: [PATCH 1/2] RHEL 5: Detect endianness functions and supply them. +Subject: [PATCH 1/3] RHEL 5: Detect endianness functions and supply them. --- configure.ac | 2 +- diff --git a/0002-RHEL-5-Also-add-le-16-64-toh-functions.patch b/0002-RHEL-5-Also-add-le-16-64-toh-functions.patch index eb44b62..83767e8 100644 --- a/0002-RHEL-5-Also-add-le-16-64-toh-functions.patch +++ b/0002-RHEL-5-Also-add-le-16-64-toh-functions.patch @@ -1,7 +1,7 @@ From d707ecc55ac2de267608435bdc1052176aecff46 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 29 Oct 2009 18:36:12 +0000 -Subject: [PATCH 2/2] RHEL 5: Also add le{16,64}toh functions +Subject: [PATCH 2/3] RHEL 5: Also add le{16,64}toh functions --- hivex/hivex.c | 12 ++++++++++++ diff --git a/0003-Fix-misspelling-in-previous-commit.patch b/0003-Fix-misspelling-in-previous-commit.patch new file mode 100644 index 0000000..e29e65a --- /dev/null +++ b/0003-Fix-misspelling-in-previous-commit.patch @@ -0,0 +1,32 @@ +From 43a8e107ce8ad6eac99da82366bdf63b401e3d31 Mon Sep 17 00:00:00 2001 +From: Richard Jones +Date: Thu, 29 Oct 2009 18:46:46 +0000 +Subject: [PATCH 3/3] Fix misspelling in previous commit. + +--- + hivex/hivex.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hivex/hivex.c b/hivex/hivex.c +index a0a730c..b522ccf 100644 +--- a/hivex/hivex.c ++++ b/hivex/hivex.c +@@ -46,13 +46,13 @@ + #define be64toh(x) __bswap_64 (x) + #endif + #ifndef le16toh +-#define le32toh(x) (x) ++#define le16toh(x) (x) + #endif + #ifndef le32toh + #define le32toh(x) (x) + #endif + #ifndef le64toh +-#define le32toh(x) (x) ++#define le64toh(x) (x) + #endif + #else + #ifndef be32toh +-- +1.6.5.rc2 + diff --git a/libguestfs.spec b/libguestfs.spec index c3e81e5..83be50e 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.75 -Release: 1%{?dist}.5 +Release: 1%{?dist}.6 License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Next lines should be removed in 1.0.76: Patch0: 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch Patch1: 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch +Patch2: 0003-Fix-misspelling-in-previous-commit.patch BuildRequires: autoconf, automake, libtool, gettext-devel # Currently fails on PPC because: @@ -327,6 +328,7 @@ Requires: jpackage-utils # Remove this in 1.0.76: %patch0 -p1 %patch1 -p1 +%patch2 -p1 mv inspector/Makefile.am inspector/Makefile.am.orig echo 'docdir = ${datadir}/doc/${PACKAGE}' > inspector/Makefile.am cat inspector/Makefile.am.orig >> inspector/Makefile.am @@ -577,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Oct 29 2009 Richard W.M. Jones - 1.0.75-1.el5.5 +* Thu Oct 29 2009 Richard W.M. Jones - 1.0.75-1.el5.6 - New upstream release 1.0.75. - New library: libhivex. - New tools: virt-win-reg, hivexml, hivexget.