Update to 1.8

3 files changed, 32 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73429f8475ed..7d53f2869ef0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,22 @@
+# Generated by mksrcinfo v8
+# Sun Oct  2 02:16:53 UTC 2016
 pkgbase = rush
 	pkgdesc = GNU Restricted User Shell
-	pkgver = 1.7
-	pkgrel = 3
+	pkgver = 1.8
+	pkgrel = 1
 	url = http://puszcza.gnu.org.ua/software/rush/
-	install = rush.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = patch
 	backup = etc/rush.rc
-	source = http://ftp.gnu.org/gnu/rush/rush-1.7.tar.xz
+	source = http://ftp.gnu.org/gnu/rush/rush-1.8.tar.xz
 	source = rush-1.7-glib-2.16-gets.patch
-	sha256sums = 56ce434639d69817dd667d5243c49045f46101583ca9e0983f176d8b92eca301
+	md5sums = 50d8bb3c0a502f2c1f5b374046ff78de
+	md5sums = dcd87b8bf9738796621030930384f97d
+	sha1sums = e882f68d9004af608b7e5c430c367645aa3e3b75
+	sha1sums = adb33d34f04846734ec3457517b46fb7a73efa6f
+	sha256sums = dd3b7bfb33570890086218aa049900a9b4d5a9e8d4878a1328e2aa88bb5793ee
 	sha256sums = 159dd2fc0fd4feec5d43cf7763a429b9c2da5c50597b157de9e5b376d9ff85a8
 
 pkgname = rush
diff --git a/PKGBUILD b/PKGBUILD
index 5d368a24f4b5..fe0393389e26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,45 +4,55 @@
 
 set -u
 pkgname='rush'
-pkgver='1.7'
-pkgrel='3'
+pkgver='1.8'
+pkgrel='1'
 pkgdesc='GNU Restricted User Shell'
 arch=('i686' 'x86_64')
 url='http://puszcza.gnu.org.ua/software/rush/'
 license=('GPL3')
+makedepends=('patch')
 backup=('etc/rush.rc')
-install='rush.install'
+#install='rush.install'
+_verwatch=("${url}download.html" "${pkgname}-\([0-9\.]\+\)\.tar.xz" 't')
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'rush-1.7-glib-2.16-gets.patch')
-sha256sums=('56ce434639d69817dd667d5243c49045f46101583ca9e0983f176d8b92eca301'
+# md5 and sha1 are published by gnu
+md5sums=('50d8bb3c0a502f2c1f5b374046ff78de'
+         'dcd87b8bf9738796621030930384f97d')
+sha1sums=('e882f68d9004af608b7e5c430c367645aa3e3b75'
+          'adb33d34f04846734ec3457517b46fb7a73efa6f')
+sha256sums=('dd3b7bfb33570890086218aa049900a9b4d5a9e8d4878a1328e2aa88bb5793ee'
             '159dd2fc0fd4feec5d43cf7763a429b9c2da5c50597b157de9e5b376d9ff85a8')
 
 prepare() {
   set -u
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/rush-1.7-glib-2.16-gets.patch"
-  sed -i -e 's/^\( *[a-z#].*\)/#\1/g' 'etc/rush.rc'
+  cd "${pkgname}-${pkgver}"
+  if [ "$(vercmp ${pkgver} '1.8')" -lt 0 ]; then
+    patch -p1 < "${srcdir}/rush-1.7-glib-2.16-gets.patch"
+  fi
+  sed -i -e 's:^\s*[^#]:#&:g' 'etc/rush.rc'
   ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --sbindir='/usr/bin'
   set +u
 }
 
 build() {
   set -u
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -s -j "$(nproc)"
+  cd "${pkgname}-${pkgver}"
+  local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
+  make -s -j "${_nproc}"
   set +u
 }
 
 check() {
   set -u
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   make check
   set +u
 }
 
 package() {
   set -u
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   set +u
 }
diff --git a/rush.install b/rush.install
deleted file mode 100644
index 00187f419324..000000000000
--- a/rush.install
+++ /dev/null
@@ -1,26 +0,0 @@
-_infodir='usr/share/info'
-_filelist=('rush.info')
-
-post_install() {
-  if [ -x 'usr/bin/install-info' ]; then
-    local _file
-    for _file in "${_filelist[@]}"; do
-      install-info "${_infodir}/${_file}.gz" "${_infodir}/dir" 2>/dev/null
-    done
-  fi
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  if [ -x 'usr/bin/install-info' ]; then
-    local _file
-    for _file in "${_filelist[@]}"; do
-      install-info --delete "${_infodir}/${_file}.gz" "${_infodir}/dir" 2>/dev/null
-    done
-  fi
-}
-
-# vim:set ts=2 sw=2 et: