From 767a370d9605b96d6958344083c107f4d961c383 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 3 Mar 2012 20:31:45 +0000 Subject: [PATCH] Rebase ruby patch. --- libguestfs.spec | 5 +++-- ruby-1.9-vendor-not-site.patch | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index c8b1e7e..fb8ca26 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.17.10 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -1038,8 +1038,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Mar 03 2012 Richard W.M. Jones - 1:1.17.10-1 +* Sat Mar 03 2012 Richard W.M. Jones - 1:1.17.10-2 - New upstream version 1.17.10. +- Rebase Ruby patch against new libguestfs. * Wed Feb 29 2012 Richard W.M. Jones - 1:1.17.9-1 - New upstream version 1.17.9. diff --git a/ruby-1.9-vendor-not-site.patch b/ruby-1.9-vendor-not-site.patch index 546ceef..b7555b1 100644 --- a/ruby-1.9-vendor-not-site.patch +++ b/ruby-1.9-vendor-not-site.patch @@ -4,10 +4,10 @@ $(RAKE) build $(RAKE) rdoc --RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']") --RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']") -+RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']") -+RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']") +-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") +-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']") ++RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") ++RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']") install: - $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)