[arch-commits] Commit in stow/trunk (01-fix-warning-message-perl5.20.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Tuesday, July 1, 2014 @ 23:11:22
  Author: seblu
Revision: 114543

upgpkg: stow 2.2.0-3

- fix FS#40767
- remove html and pdf doc

Added:
  stow/trunk/01-fix-warning-message-perl5.20.patch
Modified:
  stow/trunk/PKGBUILD

---------------------------------------+
 01-fix-warning-message-perl5.20.patch |   13 +++++++++++++
 PKGBUILD                              |   21 ++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

Added: 01-fix-warning-message-perl5.20.patch
===================================================================
--- 01-fix-warning-message-perl5.20.patch	                        (rev 0)
+++ 01-fix-warning-message-perl5.20.patch	2014-07-01 21:11:22 UTC (rev 114543)
@@ -0,0 +1,13 @@
+# https://bugs.archlinux.org/task/40767
+# https://bbs.archlinux.org/viewtopic.php?pid=1423847
+--- a/lib/Stow.pm.in	2012-02-18 20:33:34.000000000 +0000
++++ b/lib/Stow.pm.in	2014-06-08 22:46:03.420893651 +0100
+@@ -1732,7 +1732,7 @@
+     }
+     elsif (-l $path) {
+         debug(4, "  read_a_link($path): real link");
+-        return readlink $path
++        (return readlink $path)
+             or error("Could not read link: $path");
+     }
+     internal_error("read_a_link() passed a non link path: $path\n");

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-01 19:52:41 UTC (rev 114542)
+++ PKGBUILD	2014-07-01 21:11:22 UTC (rev 114543)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Sébastien Luttringer
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
 # Contributor: eric <eric at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 # Contributor: Chris Brannon <cmbrannon79 at gmail.com>
@@ -6,21 +6,30 @@
 
 pkgname=stow
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Manage installation of multiple softwares in the same directory tree'
 url='http://www.gnu.org/software/stow/'
 arch=('any')
-source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
 license=('GPL2')
 depends=('perl')
 makedepends=('texi2html')
 checkdepends=('perl-test-output')
 install=$pkgname.install
-md5sums=('902564d502975f353d3b0514a21863b1')
+source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+        '01-fix-warning-message-perl5.20.patch')
+md5sums=('902564d502975f353d3b0514a21863b1'
+         'eef5f349057aea7dcbf6567a63f26096')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p 1 < '01-fix-warning-message-perl5.20.patch'
+}
+
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --infodir=/usr/share/info \
     --with-pmdir=/usr/lib/perl5/vendor_perl/
   make
 }
@@ -33,6 +42,8 @@
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+  # remove html doc
+  rm -r "$pkgdir/usr/share/doc/$pkgname"/{manual*,version.texi}
 }
 
 # vim:set ts=2 sw=2 et: