From 833535e44de75fba765ebbf5427da1bcbbf6a0c5 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: Jan 28 2010 10:04:50 +0000
Subject: Backport special handling of libgcc_s.so.


---

diff --git a/0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch b/0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch
new file mode 100644
index 0000000..d996c76
--- /dev/null
+++ b/0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch
@@ -0,0 +1,30 @@
+From dab98a0e52b9bb9930048b94d637a2fdb218fc45 Mon Sep 17 00:00:00 2001
+From: Richard Jones <rjones@redhat.com>
+Date: Thu, 28 Jan 2010 09:59:08 +0000
+Subject: [PATCH] supermin: Add special case for libgcc_s-*.so.N
+
+Because this file contains the GCC version and a date, it frequently
+changes on the host.  Create a special case so that this file is
+matched using a wildcard for the version/date part of the name.
+---
+ appliance/supermin-split.sh.in |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/appliance/supermin-split.sh.in b/appliance/supermin-split.sh.in
+index 7b83afb..c710dc3 100755
+--- a/appliance/supermin-split.sh.in
++++ b/appliance/supermin-split.sh.in
+@@ -78,6 +78,10 @@ for path in $(find -not -name fakeroot.log); do
+     elif [[ "$file" =~ '^libbfd-.*\.so$' ]]; then
+         echo "$dir/libbfd-*.so" >&6
+ 
++    # Special case for libgcc_s-<gccversion>-<date>.so.N
++    elif [[ "$file" =~ '^libgcc_s-.*\.so\.([0-9]+)$' ]]; then
++        echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6
++
+     # libfoo-1.2.3.so
+     elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so$' ]]; then
+         echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6
+-- 
+1.6.5.2
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 460f0ad..273a88c 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.81
-Release:     5%{?dist}
+Release:     6%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -15,6 +15,10 @@ BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:      libguestfs-1.0.79-no-fuse-test.patch
 
+# Backport special handling of libgcc_s dependency.
+# http://git.annexia.org/?p=libguestfs.git;a=commit;h=dab98a0e52b9bb9930048b94d637a2fdb218fc45
+Patch1:      0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -334,6 +338,7 @@ Requires:    jpackage-utils
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -609,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-6
+- Backport special handling of libgcc_s.so.
+
 * Fri Jan 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-5
 - Require febootstrap >= 2.6 (RHBZ#557262).