Date: Friday, February 24, 2012 @ 19:41:44 Author: tomegun Revision: 151116
upgpkg: util-linux 2.21-2 fix old bug with trailing slashes in fstab apply canonization patches avoid false negative in the return value of mount -a Modified: util-linux/trunk/PKGBUILD Deleted: util-linux/trunk/build-sys-don-t-create-empty-man-ru-directory.patch -----------------------------------------------------+ PKGBUILD | 8 ++-- build-sys-don-t-create-empty-man-ru-directory.patch | 29 ------------------ 2 files changed, 4 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-02-25 00:36:50 UTC (rev 151115) +++ PKGBUILD 2012-02-25 00:41:44 UTC (rev 151116) @@ -4,7 +4,7 @@ pkgname=util-linux pkgver=2.21 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -15,7 +15,6 @@ license=('GPL2') options=('!libtool') source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.xz - build-sys-don-t-create-empty-man-ru-directory.patch libmount-canonicalize-all-paths-from-fs-tab.patch lib-canonicalize-always-remove-tailing-slash.patch libmount-canonicalize-targets-from-fstab-on-mount-a.patch @@ -28,7 +27,6 @@ # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - patch -p1 -i ../build-sys-don-t-create-empty-man-ru-directory.patch patch -p1 -i ../libmount-canonicalize-all-paths-from-fs-tab.patch patch -p1 -i ../lib-canonicalize-always-remove-tailing-slash.patch patch -p1 -i ../libmount-canonicalize-targets-from-fstab-on-mount-a.patch @@ -52,9 +50,11 @@ cd "${pkgdir}" install -dm755 var/lib/hwclock + + # delete stray empty dir, fixed upstream + rm -r usr/share/man/ru } md5sums=('208aa058f4117759d2939d1be7d662fc' - '066a55b04c07a1e0b777e90ab2fe0c6e' 'c4011222a19b020d9b8465c3c7e443f6' '8c1bf7b10e22e2b835441e6ae2d804d6' '7b92423c588ed35229a9a166349c29a9' Deleted: build-sys-don-t-create-empty-man-ru-directory.patch =================================================================== --- build-sys-don-t-create-empty-man-ru-directory.patch 2012-02-25 00:36:50 UTC (rev 151115) +++ build-sys-don-t-create-empty-man-ru-directory.patch 2012-02-25 00:41:44 UTC (rev 151116) @@ -1,29 +0,0 @@ -From 6a0335d6cbdedeacc0afef251a53c945699ddea7 Mon Sep 17 00:00:00 2001 -From: Karel Zak <k...@redhat.com> -Date: Fri, 24 Feb 2012 14:09:27 +0100 -Subject: [PATCH 01/12] build-sys: don't create empty man/ru directory - -Reported-by: Tom Gundersen <t...@jklm.no> -Signed-off-by: Karel Zak <k...@redhat.com> ---- - man/ru/Makefile.am | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am -index 799feca..31fafb9 100644 ---- a/man/ru/Makefile.am -+++ b/man/ru/Makefile.am -@@ -1,9 +1,7 @@ - include $(top_srcdir)/config/include-Makefile.am - -+if BUILD_DDATE - mandir = @mandir@/ru -- - dist_man_MANS = -- --if BUILD_DDATE - dist_man_MANS += ddate.1 - endif --- -1.7.9.2 -