Date: Saturday, May 10, 2014 @ 15:25:27 Author: dreisner Revision: 212190
upgpkg: shadow 4.2.1-1 - back out temp hacks for 4.2 release Modified: shadow/trunk/PKGBUILD ----------+ PKGBUILD | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-10 06:22:34 UTC (rev 212189) +++ PKGBUILD 2014-05-10 13:25:27 UTC (rev 212190) @@ -3,7 +3,7 @@ # Maintainer: Aaron Griffin <aa...@archlinux.org> pkgname=shadow -pkgver=4.2 +pkgver=4.2.1 pkgrel=1 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64') @@ -11,7 +11,6 @@ license=('BSD') groups=('base') depends=('bash' 'pam' 'acl') -makedepends=('libxslt' 'gnome-doc-utils' 'docbook-xsl') backup=(etc/login.defs etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel} etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} @@ -32,7 +31,7 @@ xstrdup.patch shadow-strncpy-usage.patch lastlog.tmpfiles) -sha1sums=('77feddc823a42623462d3c3a9a49f2f6cf213ca9' +sha1sums=('0917cbadd4ce0c7c36670e5ecd37bbed92e6d82d' 'SKIP' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' @@ -56,13 +55,7 @@ patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" # supress etc/pam.d/*, we provide our own - sed -i '/^SUBDIRS/s/pam\.d//' etc/Makefile.am - - # XXX: The tarball for 4.2 wasn't created with make dist, so this means we - # have to do this ourselves. It also means the manpages aren't pregenerated, - # so we have to pass --enable-man, and add additional makedepends. - # http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2014-May/010237.html - autoreconf -fi + sed -i '/^SUBDIRS/s/pam\.d//' etc/Makefile.in } build() { @@ -73,10 +66,9 @@ --prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/bin \ - --libdir=/lib \ + --libdir=/usr/lib \ --mandir=/usr/share/man \ --sysconfdir=/etc \ - --enable-man \ --with-libpam \ --with-group-name-max-length=32 \ --without-selinux