upgpkg: libabigail 2.0-1

* New upstream release.
* Change license: LGPL3 to Apache.
* Add build dependency: python-sphinx.
* Generate man page for kmidiff with new patch.

3 files changed, 79 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c37f9ddde74f..588f35cf472e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
 pkgbase = libabigail
 	pkgdesc = ABI Generic Analysis and Instrumentation Library
-	pkgver = 1.8.2
+	pkgver = 2.0
 	pkgrel = 1
 	url = https://sourceware.org/libabigail/
-	arch = i686
 	arch = x86_64
-	license = LGPL3
+	license = Apache
+	makedepends = python-sphinx
 	depends = libxml2
 	depends = elfutils
 	depends = python
-	source = http://mirrors.kernel.org/sourceware/libabigail/libabigail-1.8.2.tar.gz
-	sha512sums = fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d
+	source = http://mirrors.kernel.org/sourceware/libabigail/libabigail-2.0.tar.gz
+	source = add_kmidiff_man.patch
+	sha512sums = 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180
+	sha512sums = 3ad314f5a1cdb0e788fae458694af7a770a1a5eeab64c1dea30ab6d112a88c86da8c971624587766c0d19138d06d6070286071b27505baaf13d3a281370f3cab
+	b2sums = 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b
+	b2sums = a0bb44acb93985362966159c60c233c050a825b38d9cecc1f48e803d721d258964d87dd11f0dd951ba4b812c7cf8ef41ea09e7b6b4584bf16c2c48b2cbd97266
 
 pkgname = libabigail
diff --git a/PKGBUILD b/PKGBUILD
index 69f62585b4e6..4075cc5f8c44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,78 @@
-# Maintainer: Alexander 'z33ky' Hirsch <1zeeky@gmail.com>
+# Maintainer: George Rawlinson <grawlinson@archlinux.org>
+# Contributor: Alexander 'z33ky' Hirsch <1zeeky@gmail.com>
 
 pkgname=libabigail
-pkgver=1.8.2
+pkgver=2.0
 pkgrel=1
 pkgdesc='ABI Generic Analysis and Instrumentation Library'
-arch=('i686' 'x86_64')
-license=('LGPL3')
+arch=('x86_64')
+license=('Apache')
 url='https://sourceware.org/libabigail/'
 depends=('libxml2' 'elfutils' 'python')
-source=('http://mirrors.kernel.org/sourceware/libabigail/libabigail-1.8.2.tar.gz')
-sha512sums=('fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d')
+makedepends=('python-sphinx')
+source=(
+  "http://mirrors.kernel.org/sourceware/libabigail/libabigail-$pkgver.tar.gz"
+  'add_kmidiff_man.patch'
+)
+sha512sums=('288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180'
+            '3ad314f5a1cdb0e788fae458694af7a770a1a5eeab64c1dea30ab6d112a88c86da8c971624587766c0d19138d06d6070286071b27505baaf13d3a281370f3cab')
+b2sums=('2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b'
+        'a0bb44acb93985362966159c60c233c050a825b38d9cecc1f48e803d721d258964d87dd11f0dd951ba4b812c7cf8ef41ea09e7b6b4584bf16c2c48b2cbd97266')
 
 prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	autoreconf -fi
+  cd "$pkgname-$pkgver"
+
+  patch -p1 -i ../add_kmidiff_man.patch
+
+  autoreconf -fi
 }
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --with-gnu-ld --enable-bash-completion --enable-cxx11 --disable-static --disable-apidoc --disable-manual
-	make
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-bash-completion \
+    --disable-manual \
+    --disable-apidoc \
+    --disable-static
+
+  make
+
+  # man pages
+  make -C doc/manuals man
 }
 
 check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make check
+  cd "$pkgname-$pkgver"
+  make check
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # man pages
+  OLDIFS="$IFS"
+  IFS="."
+  pushd doc/manuals/man
+
+  # delete Fedora-specific man page
+  rm -vf fedabipkgdiff.1
+
+  for filename in *; do
+    read -ra PART <<< "$filename"
+    section="${PART[1]}"
+    install -vDm644 -t "$pkgdir/usr/share/man/man${section}" "$filename"
+  done
+  IFS="$OLDIFS"
+  unset OLDIFS
+  popd
+
+  # bash completion
+  cd bash-completion
+  for filename in abicompat abidiff abidw abilint abipkgdiff; do
+    install -vDm644 -t "$pkgdir/usr/share/bash-completion/completions" "$filename"
+  done
 }
diff --git a/add_kmidiff_man.patch b/add_kmidiff_man.patch
new file mode 100644
index 000000000000..ba68ad698d9d
--- /dev/null
+++ b/add_kmidiff_man.patch
@@ -0,0 +1,10 @@
+--- a/doc/manuals/conf.py
++++ b/doc/manuals/conf.py
+@@ -220,6 +220,7 @@
+     ('abilint', 'abilint', u'validate an abigail ABI representation', [u'Dodji Seketeli'], 1),
+     ('abicompat', 'abicompat', u'check ABI compatibility', [u'Dodji Seketeli'], 1),
+     ('fedabipkgdiff', 'fedabipkgdiff', u'compare ABIs of Fedora packages', [u'Chenxiong Qi'], 1),
++    ('kmidiff', 'kmidiff', u'compare KMIs of Linux Kernel trees', [u'Unknown'], 1),
+ ]
+ 
+ # If true, show URL addresses after external links.