[packages/ruby-omnibus: 2/2] install copy of makeself files to package dir

[glen]

commit bfd280ba0d2e076f9c4ebe129c81ba65491300c9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jun 18 23:39:26 2013 +0300

    install copy of makeself files to package dir

 makeself-path.patch | 11 +++++++++++
 ruby-omnibus.spec   |  6 ++++++
 2 files changed, 17 insertions(+)
---
diff --git a/ruby-omnibus.spec b/ruby-omnibus.spec
index 0663a52..791c14e 100644
--- a/ruby-omnibus.spec
+++ b/ruby-omnibus.spec
@@ -11,6 +11,7 @@ License:	Apache v2.0
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5:	4ae9235161a1553a87abca21f6672414
+Patch0:		makeself-path.patch
 URL:		https://github.com/opscode/omnibus-ruby
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.656
@@ -38,6 +39,11 @@ Omnibus helps you build self-installing, full-stack software builds.
 %prep
 %setup -q -n %{pkgname}-%{version}
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
+%patch0 -p1
+
+# move these to libdir, so they don't clobber system bin dir
+chmod a-x bin/makeself*
+mv bin/makeself* lib/%{pkgname}
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/makeself-path.patch b/makeself-path.patch
new file mode 100644
index 0000000..db97ca9
--- /dev/null
+++ b/makeself-path.patch
@@ -0,0 +1,11 @@
+--- omnibus-1.1.0/lib/omnibus/project.rb~	2013-06-17 23:06:28.000000000 +0300
++++ omnibus-1.1.0/lib/omnibus/project.rb	2013-06-17 23:14:37.517491627 +0300
+@@ -559,7 +559,7 @@
+ 
+     # TODO: what's this do?
+     def makeself_command
+-      command_and_opts = [ File.expand_path(File.join(Omnibus.source_root, "bin", "makeself.sh")),
++      command_and_opts = [ File.expand_path(File.join(Omnibus.source_root, "makeself.sh")),
+                            "--gzip",
+                            install_path,
+                            output_package("makeself"),
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-omnibus.git/commitdiff/bfd280ba0d2e076f9c4ebe129c81ba65491300c9