Author: alucard Date: Wed Feb 15 12:39:40 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- support for PLD in grains
---- Files affected:
packages/python-salt:
python-salt.spec (1.1 -> 1.2) , python-salt-grains.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/python-salt/python-salt.spec
diff -u packages/python-salt/python-salt.spec:1.1
packages/python-salt/python-salt.spec:1.2
--- packages/python-salt/python-salt.spec:1.1 Tue Feb 14 16:05:42 2012
+++ packages/python-salt/python-salt.spec Wed Feb 15 13:39:35 2012
@@ -3,22 +3,23 @@
Summary: Powerful remote config and execution manager.
Name: python-%{appname}
Version: 0.9.6
-Release: 0.1
+Release: 0.2
License: Apache 2.0
Group: Libraries/Python
Source0:
https://github.com/downloads/saltstack/%{appname}/%{appname}-%{version}.tar.gz
# Source0-md5: 8c1fe119e6f1fd96bc06614473509bf1
+Patch0: %{name}-grains.patch
URL: http://saltstack.org/
BuildRequires: gettext
BuildRequires: python-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
-%pyrequires_eq python-modules
Requires: python-Crypto
Requires: python-M2Crypto
Requires: python-PyYAML
Requires: python-msgpack
Requires: python-pyzmq
+%pyrequires_eq python-modules
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -28,6 +29,7 @@
%prep
%setup -q -n %{appname}-%{version}
+%patch0 -p1
%build
export CFLAGS="%{rpmcflags}"
@@ -90,6 +92,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2012/02/15 12:39:35 alucard
+- support for PLD in grains
+
Revision 1.1 2012/02/14 15:05:42 alucard
- initial commit, works
================================================================
Index: packages/python-salt/python-salt-grains.patch
diff -u /dev/null packages/python-salt/python-salt-grains.patch:1.1
--- /dev/null Wed Feb 15 13:39:40 2012
+++ packages/python-salt/python-salt-grains.patch Wed Feb 15 13:39:35 2012
@@ -0,0 +1,11 @@
+--- salt-0.9.6/salt/grains/core.py_orig 2012-02-15 10:14:02.313348662
+0000
++++ salt-0.9.6/salt/grains/core.py 2012-02-15 10:15:23.770014906 +0000
+@@ -355,6 +355,8 @@ def os_data():
+ grains['lsb_{0}'.format(match.groups()[0].lower())] =
match.groups()[1].rstrip()
+ if os.path.isfile('/etc/arch-release'):
+ grains['os'] = 'Arch'
++ if os.path.isfile('/etc/pld-release'):
++ grains['os'] = 'PLD Linux'
+ elif os.path.isfile('/etc/debian_version'):
+ grains['os'] = 'Debian'
+ if 'lsb_distrib_id' in grains:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-salt/python-salt.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
