From ffe12aecda907b9bac17c0edaeb9700fb35280c1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 27 May 2012 20:40:57 +0200 Subject: [PATCH] util-linux: update to 2.21.2. --- srcpkgs/util-linux/libblkid-devel.template | 3 +-- srcpkgs/util-linux/libmount-devel.template | 3 +-- srcpkgs/util-linux/libuuid-devel.template | 3 +-- srcpkgs/util-linux/template | 21 ++++++++++----------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/srcpkgs/util-linux/libblkid-devel.template b/srcpkgs/util-linux/libblkid-devel.template index d0d7ac385c6..fcbb686ceb3 100644 --- a/srcpkgs/util-linux/libblkid-devel.template +++ b/srcpkgs/util-linux/libblkid-devel.template @@ -1,6 +1,6 @@ # Template file for 'libblkid-devel'. # -depends="zlib-devel libuuid-devel libblkid" +depends="zlib-devel libuuid-devel>=$version libblkid>=$version" short_desc="libblkid development files" long_desc=" libblkid contains a library to handle device identification @@ -8,7 +8,6 @@ long_desc=" This package contains files for development, headers, static libs, etc." - do_install() { vmove usr/include/blkid usr/include diff --git a/srcpkgs/util-linux/libmount-devel.template b/srcpkgs/util-linux/libmount-devel.template index 3eb0f9c2dd2..c18269baf53 100644 --- a/srcpkgs/util-linux/libmount-devel.template +++ b/srcpkgs/util-linux/libmount-devel.template @@ -1,6 +1,6 @@ # Template file for 'libmount-devel'. # -depends="glibc-devel libuuid-devel libblkid-devel libmount" +depends="libuuid-devel>=$version libblkid-devel>=$version libmount>=$version" short_desc="mount(8) library development files" long_desc=" This NEW LIBRARY is designed to be used in low-level utils like @@ -9,7 +9,6 @@ long_desc=" This packages contains files for development, static files, headers, etc." - do_install() { mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include diff --git a/srcpkgs/util-linux/libuuid-devel.template b/srcpkgs/util-linux/libuuid-devel.template index 19304da654c..7821b6e1acd 100644 --- a/srcpkgs/util-linux/libuuid-devel.template +++ b/srcpkgs/util-linux/libuuid-devel.template @@ -1,6 +1,6 @@ # Template file for 'libuuid-devel'. # -depends="glibc-devel libuuid" +depends="libuuid>=$version" short_desc="UUID library development files" long_desc=" libuuid generates and parses 128-bit universally unique id's (UUIDs). @@ -8,7 +8,6 @@ long_desc=" This packages contains files for development, static files, headers, etc." - do_install() { vmove usr/lib/libuuid.a usr/lib diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 03880a6c6b8..ec2602d3d1e 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,32 +1,28 @@ # Template file for 'util-linux' pkgname=util-linux -version=2.21.1 +version=2.21.2 distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.21/${pkgname}-${version}.tar.xz" depends="coreutils shadow" makedepends="pkg-config zlib-devel ncurses-devel" +replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1" +subpackages="libmount libmount-devel libblkid libblkid-devel libuuid libuuid-devel" +make_dirs="/var/lib/hwclock 0755 0 0" short_desc="Miscellaneous linux utilities" maintainer="Juan RP " homepage="http://userweb.kernel.org/~kzak/util-linux-ng" license="GPL-2" -checksum=6ffaffb46bfb1aa403f83f0c8d2700e5ec35ffcb35a0573adb10404ed16c9004 +checksum=39b25765a02385dc73580ab5edc3c5a2cecd03c92b42e41b03fd037b1c7cefe6 long_desc=" The ${pkgname} package contains miscellaneous utility programs. Among them are utilities for handling file systems, consoles, partitions, and messages." -replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1" -subpackages="libmount libmount-devel libblkid libblkid-devel libuuid libuuid-devel" -make_dirs="/var/lib/hwclock 0755 0 0" - - - do_configure() { ./configure ${CONFIGURE_SHARED_ARGS} \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --enable-partx --enable-write \ + --libdir=/usr/lib --libexecdir=/usr/lib --without-udev \ + --enable-partx --enable-write --enable-new-mount \ --enable-libuuid --disable-makeinstall-chown \ --enable-libblkid --enable-fsck --disable-rpath \ - --enable-libmount-mount \ --enable-fs-paths-extra=/usr/sbin:/usr/bin \ SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie" } @@ -38,4 +34,7 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install + # Remove obsolete chkdupexec + rm -f ${DESTDIR}/usr/bin/chkdupexe + rm -f ${DESTDIR}/usr/share/man/man1/chkdupexe.1 }