From a08325d79a05ffefa4b8939dfd3e101370390741 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 17 Dec 2012 14:06:13 +0000 Subject: [PATCH] Rebase ruby site/vendor patch. --- libguestfs.spec | 5 +++-- ruby-1.9-vendor-not-site.patch | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index e5b981c..fa4a513 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.21.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -1054,9 +1054,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs %changelog -* Mon Dec 17 2012 Richard W.M. Jones - 1:1.21.1-1 +* Mon Dec 17 2012 Richard W.M. Jones - 1:1.21.1-2 - New upstream version 1.21.1 (development branch). - Fix source URL. +- Rebase ruby site/vendor patch. * Thu Dec 13 2012 Richard W.M. Jones - 1:1.20.0-1 - New upstream version 1.20.0. diff --git a/ruby-1.9-vendor-not-site.patch b/ruby-1.9-vendor-not-site.patch index b7555b1..d2d61ee 100644 --- a/ruby-1.9-vendor-not-site.patch +++ b/ruby-1.9-vendor-not-site.patch @@ -1,6 +1,7 @@ ---- libguestfs-1.17.4.old/ruby/Makefile.am 2012-01-23 08:43:36.000000000 +0000 -+++ libguestfs-1.17.4/ruby/Makefile.am 2012-02-08 11:29:34.274858793 +0000 -@@ -54,13 +54,13 @@ +diff -ur libguestfs-1.21.1.old/ruby/Makefile.am libguestfs-1.21.1/ruby/Makefile.am +--- libguestfs-1.21.1.old/ruby/Makefile.am 2012-12-15 19:42:02.000000000 +0000 ++++ libguestfs-1.21.1/ruby/Makefile.am 2012-12-17 14:03:27.396861323 +0000 +@@ -51,14 +51,14 @@ $(RAKE) build $(RAKE) rdoc @@ -19,4 +20,5 @@ + $(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_VENDORLIB) + $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_VENDORARCH) - endif + TESTS = run-bindtests run-ruby-tests +