rpms/libguestfs/F-12 0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch, NONE, 1.1 libguestfs.spec, 1.110, 1.111

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv736

Modified Files:
	libguestfs.spec 
Added Files:
	0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch 
Log Message:
Backport special handling of libgcc_s.so.

0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch:
 supermin-split.sh.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE 0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch ---
>From dab98a0e52b9bb9930048b94d637a2fdb218fc45 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at 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



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/libguestfs.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- libguestfs.spec	26 Jan 2010 09:45:45 -0000	1.110
+++ libguestfs.spec	28 Jan 2010 10:04:53 -0000	1.111
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.81
-Release:     1%{?dist}.3
+Release:     1%{?dist}.4
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -15,6 +15,10 @@ BuildRoot:   %{_tmppath}/%{name}-%{versi
 # 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 at redhat.com> - 1.0.81-1.fc12.4
+- Backport special handling of libgcc_s.so.
+
 * Tue Jan 26 2010 Richard W.M. Jones <rjones at redhat.com> - 1.0.81-1.fc12.3
 - Rebuild because of unannounced soname bump (libgcc_s.so).