commit 6f3109046b85015816a019de3388dc806c077252
Author: Elan Ruusamäe <[email protected]>
Date: Fri Nov 14 14:07:36 2014 +0200
enforce platform_family
platform-pld.patch | 16 ++++++++++++++++
ruby-ohai.spec | 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/ruby-ohai.spec b/ruby-ohai.spec
index ad96731..d729901 100644
--- a/ruby-ohai.spec
+++ b/ruby-ohai.spec
@@ -6,12 +6,13 @@
Summary: Profiles your system and emits JSON
Name: ruby-%{pkgname}
Version: 7.4.0
-Release: 0.1
+Release: 0.2
License: Apache v2.0
Group: Development/Languages
Source0:
https://github.com/opscode/ohai/archive/%{version}/%{pkgname}-%{version}.tar.gz
# Source0-md5: 5275e5f79b618ce2af85311cd760b977
Patch0: virtualization-vserver.patch
+Patch1: platform-pld.patch
URL: http://docs.getchef.com/ohai.html
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.665
@@ -56,6 +57,7 @@ This package contains documentation for %{name}.
%prep
%setup -q -n ohai-%{version}
%patch0 -p1
+%patch1 -p1
%{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
# no plist and not darwin so don't care
diff --git a/platform-pld.patch b/platform-pld.patch
new file mode 100644
index 0000000..7ecd7de
--- /dev/null
+++ b/platform-pld.patch
@@ -0,0 +1,16 @@
+somewhy fallback [1] no longer works
+set one in linux/platform
+
+[1] https://github.com/opscode/ohai/blob/7.4.0/lib/ohai/plugins/platform.rb#L26
+
+--- ohai-7.4.0/lib/ohai/plugins/linux/platform.rb~ 2014-09-06
07:18:08.000000000 +0300
++++ ohai-7.4.0/lib/ohai/plugins/linux/platform.rb 2014-11-14
14:04:37.000000000 +0200
+@@ -121,6 +121,8 @@
+ platform_family "arch"
+ when /exherbo/
+ platform_family "exherbo"
++ when /pld/
++ platform_family "pld"
+ end
+ end
+ end
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-ohai.git/commitdiff/6f3109046b85015816a019de3388dc806c077252
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
