[clustershell] Update to 1.6

[Stephane Thiell]

commit 097caa2fde6b3f3c473ec04bf8e798fc20b7c6f9
Author: Stephane Thiell <stephane.thiell at cea.fr>
Date:   Sun Apr 8 17:18:16 2012 +0200

    Update to 1.6

 .gitignore        |    1 +
 clustershell.spec |   24 +++++++++++++++++-------
 sources           |    2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3c01495..01f1687 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /clustershell-1.4.3.tar.gz
 /clustershell-1.5.tar.gz
 /clustershell-1.5.1.tar.gz
+/clustershell-1.6.tar.gz
diff --git a/clustershell.spec b/clustershell.spec
index cdb13d9..427ab54 100644
--- a/clustershell.spec
+++ b/clustershell.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:          clustershell
-Version:       1.5.1
-Release:       2%{?dist}
+Version:       1.6
+Release:       1%{?dist}
 Summary:       Python framework for efficient cluster administration
 
 Group:         System Environment/Base
@@ -41,8 +41,9 @@ rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # config files
-install -d %{buildroot}/%{_sysconfdir}/clustershell
-install -p -m 0644 conf/*.conf %{buildroot}/%{_sysconfdir}/clustershell/
+install -d %{buildroot}/%{_sysconfdir}/clustershell/groups.conf.d
+install -p -m 0644 conf/*.conf conf/groups %{buildroot}/%{_sysconfdir}/clustershell/
+install -p -m 0644 conf/groups.conf.d/README conf/groups.conf.d/*.conf.example %{buildroot}/%{_sysconfdir}/clustershell/groups.conf.d
 
 # man pages
 install -d %{buildroot}/%{_mandir}/{man1,man5}
@@ -52,6 +53,11 @@ install -p -m 0644 doc/man/man1/nodeset.1 %{buildroot}/%{_mandir}/man1/
 install -p -m 0644 doc/man/man5/clush.conf.5 %{buildroot}/%{_mandir}/man5/
 install -p -m 0644 doc/man/man5/groups.conf.5 %{buildroot}/%{_mandir}/man5/
 
+# docs and example scripts
+install -d %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples
+install -p -m 0644 README ChangeLog Licence_CeCILL-C_V1-en.txt Licence_CeCILL-C_V1-fr.txt %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/
+install -p -m 0755 doc/examples/*.py %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/
+
 # vim addons
 %define vimdatadir %{_datadir}/vim/vimfiles
 install -d %{buildroot}/%{vimdatadir}/{ftdetect,syntax}
@@ -65,7 +71,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README ChangeLog Licence_CeCILL-C_V1-en.txt Licence_CeCILL-C_V1-fr.txt
+%doc %{_defaultdocdir}/%{name}-%{version}/
 %{_mandir}/man1/clubak.1*
 %{_mandir}/man1/clush.1*
 %{_mandir}/man1/nodeset.1*
@@ -73,7 +79,11 @@ rm -rf %{buildroot}
 %{_mandir}/man5/groups.conf.5*
 %dir %{_sysconfdir}/clustershell
 %config(noreplace) %{_sysconfdir}/clustershell/clush.conf
+%config(noreplace) %{_sysconfdir}/clustershell/groups
 %config(noreplace) %{_sysconfdir}/clustershell/groups.conf
+%dir %{_sysconfdir}/clustershell/groups.conf.d
+%doc %{_sysconfdir}/clustershell/groups.conf.d/README
+%doc %{_sysconfdir}/clustershell/groups.conf.d/*.conf.example
 %{python_sitelib}/ClusterShell/
 %{python_sitelib}/ClusterShell-*-py?.?.egg-info
 %{_bindir}/clubak
@@ -87,8 +97,8 @@ rm -rf %{buildroot}
 %{vimdatadir}/syntax/groupsconf.vim
 
 %changelog
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Sun Apr 08 2012 Stephane Thiell <stephane.thiell at cea.fr> 1.6-1
+- update to 1.6
 
 * Thu Jun 09 2011 Stephane Thiell <stephane.thiell at cea.fr> 1.5.1-1
 - update to 1.5.1
diff --git a/sources b/sources
index 01076b3..50d2e22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-027506d825ecc4b361f49d0742e63332  clustershell-1.5.1.tar.gz
+68278fb07ab52f2b96e2f00d8fe07601  clustershell-1.6.tar.gz