Update to 1.9.2

2 files changed, 33 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2d6e219fc69..08de09b94847 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = clustershell
 	pkgdesc = Python framework for efficient cluster administration
-	pkgver = 1.9.1
+	pkgver = 1.9.2
 	pkgrel = 1
 	url = http://cea-hpc.github.io/clustershell/
 	changelog = ChangeLog
@@ -11,7 +11,10 @@ pkgbase = clustershell
 	depends = python
 	optdepends = openssh: Secure SHell client to connect to distant machines,
 	optdepends = vim: Vi Improved
-	source = https://github.com/cea-hpc/clustershell/archive/v1.9.1.tar.gz
-	sha256sums = f2e206d20012767b4d8405909bde1494820b7ae70e33c8736a2425f1d9357b92
+	backup = etc/clustershell/clush.conf
+	backup = etc/clustershell/groups.conf
+	backup = etc/clustershell/groups.d/local.cfg
+	source = https://github.com/cea-hpc/clustershell/archive/v1.9.2.tar.gz
+	sha256sums = 2461dfea5ddee718c5a963d878f1e84d1340d7bfecc477d1bf8f6fe16fe2668b
 
 pkgname = clustershell
diff --git a/PKGBUILD b/PKGBUILD
index fa930e2cfec1..963944b2b891 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Aurelien Cedeyn <aurelien.cedeyn@gmail.com>
 # Maintainer: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
 pkgname="clustershell"
-pkgver=1.9.1
+pkgver=1.9.2
 pkgrel=1
 pkgdesc="Python framework for efficient cluster administration"
 arch=(any)
@@ -14,40 +14,41 @@ optdepends=('openssh: Secure SHell client to connect to distant machines', 'vim:
 provides=()
 conflicts=()
 replaces=()
-backup=()
+backup=(etc/clustershell/{clush.conf,groups.conf,groups.d/local.cfg})
 options=()
 install=
 changelog=ChangeLog
 source=(https://github.com/cea-hpc/${pkgname}/archive/v${pkgver}.tar.gz)
 noextract=()
-sha256sums=('f2e206d20012767b4d8405909bde1494820b7ae70e33c8736a2425f1d9357b92')
+sha256sums=('2461dfea5ddee718c5a963d878f1e84d1340d7bfecc477d1bf8f6fe16fe2668b')
 
 build() {
-	echo "Directory: ${srcdir}/${pkgname}-${pkgver}"
-	cd ${srcdir}/${pkgname}-${pkgver}
-	python setup.py build
+    echo "Directory: ${srcdir}/${pkgname}-${pkgver}"
+    cd ${srcdir}/${pkgname}-${pkgver}
+    python setup.py build
 }
 package(){
-	cd ${srcdir}/${pkgname}-${pkgver}
-	python setup.py install -O1 --skip-build --root="${pkgdir}"
-	# config files
-	install -d ${pkgdir}/etc/clustershell
-	install -p -m 0644 conf/*.conf ${pkgdir}/etc/${pkgname}/
+    cd ${srcdir}/${pkgname}-${pkgver}
+    python setup.py install -O1 --skip-build --root="${pkgdir}"
+    # config files
+    install -d ${pkgdir}/etc/
+    mv -v ${pkgdir}/usr/etc/clustershell ${pkgdir}/etc/
 
-	# man pages
-	install -d ${pkgdir}/usr/share/man/{man1,man5}
-	install -p -m 0644 doc/man/man1/clubak.1 ${pkgdir}/usr/share/man/man1/
-	install -p -m 0644 doc/man/man1/clush.1 ${pkgdir}/usr/share/man/man1/
-	install -p -m 0644 doc/man/man1/nodeset.1 ${pkgdir}/usr/share/man/man1/
-	install -p -m 0644 doc/man/man5/clush.conf.5 ${pkgdir}/usr/share/man/man5/
-	install -p -m 0644 doc/man/man5/groups.conf.5 ${pkgdir}/usr/share/man/man5/
-	install -D -m 0644 COPYING.LGPLv2.1 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    # man pages
+    install -d ${pkgdir}/usr/share/man/{man1,man5}
+    install -p -m 0644 doc/man/man1/clubak.1 ${pkgdir}/usr/share/man/man1/
+    install -p -m 0644 doc/man/man1/cluset.1 ${pkgdir}/usr/share/man/man1/
+    install -p -m 0644 doc/man/man1/clush.1 ${pkgdir}/usr/share/man/man1/
+    install -p -m 0644 doc/man/man1/nodeset.1 ${pkgdir}/usr/share/man/man1/
+    install -p -m 0644 doc/man/man5/clush.conf.5 ${pkgdir}/usr/share/man/man5/
+    install -p -m 0644 doc/man/man5/groups.conf.5 ${pkgdir}/usr/share/man/man5/
+    install -D -m 0644 COPYING.LGPLv2.1 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-	local vimdatadir=/usr/share/vim/vimfiles
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	# vim addons
-	install -d ${pkgdir}/$vimdatadir/{ftdetect,syntax}
-	install -p -m 0644 doc/extras/vim/ftdetect/clustershell.vim ${pkgdir}/${vimdatadir}/ftdetect/
-	install -p -m 0644 doc/extras/vim/syntax/clushconf.vim ${pkgdir}/${vimdatadir}/syntax/
-	install -p -m 0644 doc/extras/vim/syntax/groupsconf.vim ${pkgdir}/${vimdatadir}/syntax/
+    local vimdatadir=/usr/share/vim/vimfiles
+    cd ${srcdir}/${pkgbase}-${pkgver}
+    # vim addons
+    install -d ${pkgdir}/$vimdatadir/{ftdetect,syntax}
+    install -p -m 0644 doc/extras/vim/ftdetect/clustershell.vim ${pkgdir}/${vimdatadir}/ftdetect/
+    install -p -m 0644 doc/extras/vim/syntax/clushconf.vim ${pkgdir}/${vimdatadir}/syntax/
+    install -p -m 0644 doc/extras/vim/syntax/groupsconf.vim ${pkgdir}/${vimdatadir}/syntax/
 }