[arch-commits] Commit in iproute2/trunk (PKGBUILD)

[Christian Hesse]

    Date: Tuesday, December 13, 2016 @ 07:58:31
  Author: eworm
Revision: 283097

upgpkg: iproute2 4.9.0-1

* new upstream release
* move examples to split package iproute2-doc
* miscellaneous cleanups

Modified:
  iproute2/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-13 07:31:48 UTC (rev 283096)
+++ PKGBUILD	2016-12-13 07:58:31 UTC (rev 283097)
@@ -1,10 +1,11 @@
 # $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgbase=iproute2
 pkgname=(iproute2 iproute2-doc)
-pkgver=4.8.0
+pkgver=4.9.0
 pkgrel=1
 pkgdesc='IP Routing Utilities'
 arch=('i686' 'x86_64')
@@ -15,9 +16,9 @@
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
 source=("https://www.kernel.org/pub/linux/utils/net/${pkgbase}/${pkgbase}-${pkgver}.tar."{xz,sign}
         '0001-make-iproute2-fhs-compliant.patch')
-sha1sums=('eba7c753918ddcf8b3890718391fb795f8dd023b'
-          'SKIP'
-          '1ed328854983b3f9df0a143aa7c77920916a13c1')
+sha256sums=('c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4'
+            'SKIP'
+            'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -53,26 +54,29 @@
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install
 
-  # remove sgml and tex files... we have html and pdf in iproute2-doc
-  rm "${pkgdir}/usr/share/doc/iproute2/"*.{sgml,tex}
+  # remove documentation
+  rm -rf "${pkgdir}/usr/share/doc/"
 
   # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
-  install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
-
-  # move binaries
-  cd "${pkgdir}"
-  mv sbin usr/bin
+  install -Dm0644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
+  install -Dm0644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
 }
 
 package_iproute2-doc() {
   pkgdesc='IP Routing Utilities documentation'
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/doc"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  install -d "${pkgdir}/usr/share/doc/iproute2/"
-  install *.html *.pdf "${pkgdir}/usr/share/doc/iproute2/"
+  make DESTDIR="${pkgdir}" install
+
+  # documentation is included in default install target... So clean up here.
+  find "${pkgdir}/" ! -type d ! -regex '.*examples.*' -delete
+  find "${pkgdir}/" -empty -delete
+  find "${pkgdir}/" -name '*.sgml' -delete
+  find "${pkgdir}/" -name '*.tex' -delete
+
+  install -m0644 doc/*.html doc/*.pdf "${pkgdir}/usr/share/doc/iproute2/"
 }