[libguestfs] Upstream patch to fix libtool wrapper script.
Richard W.M. Jones
rjones at fedoraproject.org
Fri Nov 26 18:28:18 UTC 2010
commit 5056a1e4f276c92b7df8b438c097107ba4c82bc0
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Fri Nov 26 18:28:18 2010 +0000
Upstream patch to fix libtool wrapper script.
...-Don-t-do-fix-if-there-was-no-o-option-to.patch | 37 ++++++++++++++++++++
libguestfs.spec | 8 +++-
2 files changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/0001-libtool-fix-Don-t-do-fix-if-there-was-no-o-option-to.patch b/0001-libtool-fix-Don-t-do-fix-if-there-was-no-o-option-to.patch
new file mode 100644
index 0000000..667ddf0
--- /dev/null
+++ b/0001-libtool-fix-Don-t-do-fix-if-there-was-no-o-option-to.patch
@@ -0,0 +1,37 @@
+From 60b3c8e81124a881cd93ed66c167cac37e87c36b Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones at redhat.com>
+Date: Fri, 26 Nov 2010 18:26:09 +0000
+Subject: [PATCH] libtool fix: Don't do fix if there was no -o option to libtool.
+
+For example if libtool is being run as 'libtool --mode=execute ...'
+
+This fixes commit 4cf4f2b66f850bb39c5bf29d3cd12ada9114d67e.
+---
+ libtool-kill-dependency_libs.sh | 13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libtool-kill-dependency_libs.sh b/libtool-kill-dependency_libs.sh
+index 1403fbe..9f17038 100755
+--- a/libtool-kill-dependency_libs.sh
++++ b/libtool-kill-dependency_libs.sh
+@@ -49,9 +49,12 @@ done
+ # Run libtool as normal.
+ #echo "${args[@]}"
+ "${args[@]}"
+-mv "$output" "$output.tmp"
+
+-# Remove dependency_libs from output.
+-sed "s/^dependency_libs=.*/dependency_libs=''/" < "$output.tmp" > "$output"
+-chmod --reference="$output.tmp" "$output"
+-rm "$output.tmp"
++if [ -n "$output" ]; then
++ mv "$output" "$output.tmp"
++
++ # Remove dependency_libs from output.
++ sed "s/^dependency_libs=.*/dependency_libs=''/" < "$output.tmp" > "$output"
++ chmod --reference="$output.tmp" "$output"
++ rm "$output.tmp"
++fi
+--
+1.7.3.2
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 5ded2ab..3c9bc1a 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.7.15
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -52,6 +52,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Disable FUSE tests, not supported in Koji at the moment.
Patch0: libguestfs-1.7.13-no-fuse-test.patch
+# Upstream patch to fix libtool wrapper script.
+Patch1: 0001-libtool-fix-Don-t-do-fix-if-there-was-no-o-option-to.patch
+
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
@@ -434,6 +437,7 @@ php-%{name} contains PHP bindings for %{name}.
%setup -q
%patch0 -p1
+%patch1 -p1
mkdir -p daemon/m4
@@ -736,7 +740,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Nov 26 2010 Richard Jones <rjones at redhat.com> - 1:1.7.15-1
+* Fri Nov 26 2010 Richard Jones <rjones at redhat.com> - 1:1.7.15-2
- New upstream development version 1.7.15.
- Split out new libguestfs-tools-c package from libguestfs-tools.
. This is so that the -tools-c package can be pulled in by people
More information about the scm-commits
mailing list