iproute2-selinux 4.8.0-1 update

2 files changed, 56 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56d2662a6384..2ca5e5e41ff5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,44 @@
 pkgbase = iproute2-selinux
 	pkgdesc = IP Routing Utilities with SELinux support
-	pkgver = 4.7.0
+	pkgver = 4.8.0
 	pkgrel = 1
 	url = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 	arch = i686
 	arch = x86_64
-	groups = base
 	license = GPL2
 	makedepends = linux-atm
+	makedepends = linuxdoc-tools
+	makedepends = texlive-bin
+	makedepends = texlive-core
+	makedepends = texlive-latexextra
+	options = staticlibs
+	options = !makeflags
+	source = http://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.8.0.tar.xz
+	source = http://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.8.0.tar.sign
+	source = 0001-make-iproute2-fhs-compliant.patch
+	validpgpkeys = 9F6FC345B05BE7E766B83C8F80A77F6095CDE47E
+	sha1sums = eba7c753918ddcf8b3890718391fb795f8dd023b
+	sha1sums = SKIP
+	sha1sums = 1ed328854983b3f9df0a143aa7c77920916a13c1
+
+pkgname = iproute2-selinux
+	groups = base
 	depends = glibc
 	depends = iptables
 	depends = libselinux
 	optdepends = linux-atm: ATM support
 	provides = iproute
-	provides = iproute2=4.7.0-1
+	provides = iproute2=4.8.0-1
 	conflicts = iproute
 	conflicts = iproute2
 	replaces = iproute
-	options = staticlibs
-	options = !makeflags
 	backup = etc/iproute2/ematch_map
 	backup = etc/iproute2/rt_dsfield
 	backup = etc/iproute2/rt_protos
 	backup = etc/iproute2/rt_realms
 	backup = etc/iproute2/rt_scopes
 	backup = etc/iproute2/rt_tables
-	source = http://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.7.0.tar.xz
-	source = http://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.7.0.tar.sign
-	source = 0001-make-iproute2-fhs-compliant.patch
-	validpgpkeys = 9F6FC345B05BE7E766B83C8F80A77F6095CDE47E
-	sha1sums = eafdefb9ebe7c840fa4ea8ea111554e3650a3c5a
-	sha1sums = SKIP
-	sha1sums = 1ed328854983b3f9df0a143aa7c77920916a13c1
 
-pkgname = iproute2-selinux
+pkgname = iproute2-selinux-doc
+	pkgdesc = IP Routing Utilities documentation
 
diff --git a/PKGBUILD b/PKGBUILD
index fe58508d8591..91843206e4c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,25 @@
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # SELinux Maintainer: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
 
-pkgname=iproute2-selinux
-pkgver=4.7.0
+pkgbase=iproute2-selinux
+pkgname=(iproute2-selinux iproute2-selinux-doc)
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="IP Routing Utilities with SELinux support"
 arch=('i686' 'x86_64')
 license=('GPL2')
-url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'iptables' 'libselinux')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-groups=('base')
-provides=('iproute' "${pkgname/-selinux}=${pkgver}-${pkgrel}")
-conflicts=('iproute' "${pkgname/-selinux}")
-replaces=('iproute')
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2'
+makedepends=('linux-atm' 'linuxdoc-tools' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
 options=('staticlibs' '!makeflags')
-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')
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
-source=("http://www.kernel.org/pub/linux/utils/net/${pkgname/-selinux}/${pkgname/-selinux}-$pkgver.tar."{xz,sign}
+source=("http://www.kernel.org/pub/linux/utils/net/${pkgbase/-selinux}/${pkgbase/-selinux}-${pkgver}.tar."{xz,sign}
         '0001-make-iproute2-fhs-compliant.patch')
-sha1sums=('eafdefb9ebe7c840fa4ea8ea111554e3650a3c5a'
+sha1sums=('eba7c753918ddcf8b3890718391fb795f8dd023b'
           'SKIP'
           '1ed328854983b3f9df0a143aa7c77920916a13c1')
 
 prepare() {
-  cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
+  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
 
   # set correct fhs structure
   patch -Np1 -i "${srcdir}/0001-make-iproute2-fhs-compliant.patch"
@@ -39,17 +32,33 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
+  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
 
   ./configure --with-selinux
   make
+
+  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}/doc/"
+
+  make html pdf
 }
 
-package() {
-  cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
+package_iproute2-selinux() {
+  depends=('glibc' 'iptables' 'libselinux')
+  optdepends=('linux-atm: ATM support')
+  groups=('base')
+  provides=('iproute' "${pkgname/-selinux}=${pkgver}-${pkgrel}")
+  conflicts=('iproute' "${pkgname/-selinux}")
+  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')
+
+  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
+  # remove sgml and tex files... we have html and pdf in iproute2-doc
+  rm "${pkgdir}/usr/share/doc/iproute2/"*.{sgml,tex}
+
   # 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"
@@ -57,5 +66,14 @@ package() {
   # move binaries
   cd "${pkgdir}"
   mv sbin usr/bin
+}
+
+package_iproute2-selinux-doc() {
+  pkgdesc='IP Routing Utilities documentation'
 
+  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}/doc"
+
+  install -d "${pkgdir}/usr/share/doc/iproute2/"
+  install *.html *.pdf "${pkgdir}/usr/share/doc/iproute2/"
 }
+