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

[Christian Hesse]

    Date: Monday, November 13, 2017 @ 19:51:12
  Author: eworm
Revision: 309878

upgpkg: iproute2 4.14.1-1

* new upstream release
* drop old ducumentation and remove iproute2-doc package

Modified:
  iproute2/trunk/PKGBUILD

----------+
 PKGBUILD |   67 +++++++++++++++++++++----------------------------------------
 1 file changed, 24 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-13 16:32:33 UTC (rev 309877)
+++ PKGBUILD	2017-11-13 19:51:12 UTC (rev 309878)
@@ -3,25 +3,38 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
-pkgbase=iproute2
-pkgname=(iproute2 iproute2-doc)
-pkgver=4.13.0
+pkgname=iproute2
+pkgver=4.14.1
 pkgrel=1
 pkgdesc='IP Routing Utilities'
 arch=('i686' 'x86_64')
 license=('GPL2')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2'
-makedepends=('iptables' 'linux-atm' 'linuxdoc-tools' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
-options=('staticlibs' '!makeflags')
+depends=('glibc' 'iptables' 'libelf')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+# Upstream commit b2fd7a0e6efa7b85a041b5cb9ea6fc1a6a798fd3 removed old documentation.
+# Add conflict and replace to get rid of the package. TODO: Remove anytime soon.
+conflicts=('iproute' 'iproute2-doc')
+replaces=('iproute' 'iproute2-doc')
+backup=('etc/iproute2/ematch_map'
+        'etc/iproute2/rt_dsfield'
+        'etc/iproute2/rt_protos'
+        'etc/iproute2/rt_realms'
+        'etc/iproute2/rt_scopes'
+        'etc/iproute2/rt_tables')
+makedepends=('linux-atm')
+options=('staticlibs')
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
-source=("https://www.kernel.org/pub/linux/utils/net/${pkgbase}/${pkgbase}-${pkgver}.tar."{xz,sign}
+source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
         '0001-make-iproute2-fhs-compliant.patch')
-sha256sums=('9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50'
+sha256sums=('d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067'
             'SKIP'
             'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
 
 prepare() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # set correct fhs structure
   patch -Np1 -i "${srcdir}/0001-make-iproute2-fhs-compliant.patch"
@@ -32,51 +45,19 @@
 }
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure
   make
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/doc/"
-
-  make html pdf
 }
 
-package_iproute2() {
-  depends=('glibc' 'iptables' 'libelf')
-  optdepends=('linux-atm: ATM support')
-  groups=('base')
-  provides=('iproute')
-  conflicts=('iproute')
-  replaces=('iproute')
-  backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
-    'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
   make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install
 
-  # remove documentation
-  rm -rf "${pkgdir}/usr/share/doc/"
-
   # libnetlink isn't installed, install it FS#19385
   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}"
-
-  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/"
-}
-