From 40fccb5321d6b5d2b564c9000ce334c384a15df5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 Jan 2011 14:46:12 +0100 Subject: [PATCH] util-linux-ng: upstream renamed it again to util-linux. Update to 2.19rc1. --HG-- rename : srcpkgs/util-linux-ng/INSTALL => srcpkgs/util-linux/INSTALL rename : srcpkgs/util-linux-ng/depends => srcpkgs/util-linux/depends rename : srcpkgs/util-linux-ng/files/adjtime.cron-hourly => srcpkgs/util-linux/files/adjtime.cron-hourly rename : srcpkgs/util-linux-ng/libblkid-devel.template => srcpkgs/util-linux/libblkid-devel.template rename : srcpkgs/util-linux-ng/libblkid.template => srcpkgs/util-linux/libblkid.template rename : srcpkgs/util-linux-ng/libmount-devel.template => srcpkgs/util-linux/libmount-devel.template rename : srcpkgs/util-linux-ng/libmount.template => srcpkgs/util-linux/libmount.template rename : srcpkgs/util-linux-ng/libuuid-devel.template => srcpkgs/util-linux/libuuid-devel.template rename : srcpkgs/util-linux-ng/libuuid.template => srcpkgs/util-linux/libuuid.template rename : srcpkgs/util-linux-ng/template => srcpkgs/util-linux/template --- srcpkgs/libblkid | 2 +- srcpkgs/libblkid-devel | 2 +- srcpkgs/libmount | 2 +- srcpkgs/libmount-devel | 2 +- srcpkgs/libuuid | 2 +- srcpkgs/libuuid-devel | 2 +- srcpkgs/{util-linux-ng => util-linux}/INSTALL | 0 srcpkgs/{util-linux-ng => util-linux}/depends | 2 +- .../files/adjtime.cron-hourly | 0 .../libblkid-devel.template | 0 .../libblkid.template | 0 .../libmount-devel.template | 0 .../libmount.template | 0 .../libuuid-devel.template | 0 .../libuuid.template | 0 .../{util-linux-ng => util-linux}/template | 19 +++++++++++-------- 16 files changed, 18 insertions(+), 15 deletions(-) rename srcpkgs/{util-linux-ng => util-linux}/INSTALL (100%) rename srcpkgs/{util-linux-ng => util-linux}/depends (58%) rename srcpkgs/{util-linux-ng => util-linux}/files/adjtime.cron-hourly (100%) rename srcpkgs/{util-linux-ng => util-linux}/libblkid-devel.template (100%) rename srcpkgs/{util-linux-ng => util-linux}/libblkid.template (100%) rename srcpkgs/{util-linux-ng => util-linux}/libmount-devel.template (100%) rename srcpkgs/{util-linux-ng => util-linux}/libmount.template (100%) rename srcpkgs/{util-linux-ng => util-linux}/libuuid-devel.template (100%) rename srcpkgs/{util-linux-ng => util-linux}/libuuid.template (100%) rename srcpkgs/{util-linux-ng => util-linux}/template (69%) diff --git a/srcpkgs/libblkid b/srcpkgs/libblkid index 4bc22946d3b..a7ce47a999f 120000 --- a/srcpkgs/libblkid +++ b/srcpkgs/libblkid @@ -1 +1 @@ -util-linux-ng \ No newline at end of file +util-linux \ No newline at end of file diff --git a/srcpkgs/libblkid-devel b/srcpkgs/libblkid-devel index 4bc22946d3b..a7ce47a999f 120000 --- a/srcpkgs/libblkid-devel +++ b/srcpkgs/libblkid-devel @@ -1 +1 @@ -util-linux-ng \ No newline at end of file +util-linux \ No newline at end of file diff --git a/srcpkgs/libmount b/srcpkgs/libmount index 4bc22946d3b..a7ce47a999f 120000 --- a/srcpkgs/libmount +++ b/srcpkgs/libmount @@ -1 +1 @@ -util-linux-ng \ No newline at end of file +util-linux \ No newline at end of file diff --git a/srcpkgs/libmount-devel b/srcpkgs/libmount-devel index 4bc22946d3b..a7ce47a999f 120000 --- a/srcpkgs/libmount-devel +++ b/srcpkgs/libmount-devel @@ -1 +1 @@ -util-linux-ng \ No newline at end of file +util-linux \ No newline at end of file diff --git a/srcpkgs/libuuid b/srcpkgs/libuuid index 4bc22946d3b..a7ce47a999f 120000 --- a/srcpkgs/libuuid +++ b/srcpkgs/libuuid @@ -1 +1 @@ -util-linux-ng \ No newline at end of file +util-linux \ No newline at end of file diff --git a/srcpkgs/libuuid-devel b/srcpkgs/libuuid-devel index 4bc22946d3b..a7ce47a999f 120000 --- a/srcpkgs/libuuid-devel +++ b/srcpkgs/libuuid-devel @@ -1 +1 @@ -util-linux-ng \ No newline at end of file +util-linux \ No newline at end of file diff --git a/srcpkgs/util-linux-ng/INSTALL b/srcpkgs/util-linux/INSTALL similarity index 100% rename from srcpkgs/util-linux-ng/INSTALL rename to srcpkgs/util-linux/INSTALL diff --git a/srcpkgs/util-linux-ng/depends b/srcpkgs/util-linux/depends similarity index 58% rename from srcpkgs/util-linux-ng/depends rename to srcpkgs/util-linux/depends index 024cc3e8ddb..f1429dbc703 100644 --- a/srcpkgs/util-linux-ng/depends +++ b/srcpkgs/util-linux/depends @@ -1,2 +1,2 @@ -abi_depends=">=2.15" +abi_depends=">=2.18" api_depends="${abi_depends}" diff --git a/srcpkgs/util-linux-ng/files/adjtime.cron-hourly b/srcpkgs/util-linux/files/adjtime.cron-hourly similarity index 100% rename from srcpkgs/util-linux-ng/files/adjtime.cron-hourly rename to srcpkgs/util-linux/files/adjtime.cron-hourly diff --git a/srcpkgs/util-linux-ng/libblkid-devel.template b/srcpkgs/util-linux/libblkid-devel.template similarity index 100% rename from srcpkgs/util-linux-ng/libblkid-devel.template rename to srcpkgs/util-linux/libblkid-devel.template diff --git a/srcpkgs/util-linux-ng/libblkid.template b/srcpkgs/util-linux/libblkid.template similarity index 100% rename from srcpkgs/util-linux-ng/libblkid.template rename to srcpkgs/util-linux/libblkid.template diff --git a/srcpkgs/util-linux-ng/libmount-devel.template b/srcpkgs/util-linux/libmount-devel.template similarity index 100% rename from srcpkgs/util-linux-ng/libmount-devel.template rename to srcpkgs/util-linux/libmount-devel.template diff --git a/srcpkgs/util-linux-ng/libmount.template b/srcpkgs/util-linux/libmount.template similarity index 100% rename from srcpkgs/util-linux-ng/libmount.template rename to srcpkgs/util-linux/libmount.template diff --git a/srcpkgs/util-linux-ng/libuuid-devel.template b/srcpkgs/util-linux/libuuid-devel.template similarity index 100% rename from srcpkgs/util-linux-ng/libuuid-devel.template rename to srcpkgs/util-linux/libuuid-devel.template diff --git a/srcpkgs/util-linux-ng/libuuid.template b/srcpkgs/util-linux/libuuid.template similarity index 100% rename from srcpkgs/util-linux-ng/libuuid.template rename to srcpkgs/util-linux/libuuid.template diff --git a/srcpkgs/util-linux-ng/template b/srcpkgs/util-linux/template similarity index 69% rename from srcpkgs/util-linux-ng/template rename to srcpkgs/util-linux/template index a8646288131..b2c1da8be5e 100644 --- a/srcpkgs/util-linux-ng/template +++ b/srcpkgs/util-linux/template @@ -1,21 +1,24 @@ -# Template file for 'util-linux-ng' -pkgname=util-linux-ng -version=2.18 -distfiles="${KERNEL_SITE}/utils/$pkgname/v2.18/$pkgname-$version.tar.bz2" +# Template file for 'util-linux' +pkgname=util-linux +_distver=2.19 +_patchver=rc1 +version=${_distver}${_patchver} +wrksrc=${pkgname}-${_distver}-${_patchver} +distfiles="${KERNEL_SITE}/utils/${pkgname}-ng/v${_distver}/${pkgname}-${_distver}-${_patchver}.tar.bz2" build_style=gnu_configure configure_args="--enable-partx --enable-write --enable-libuuid --enable-libblkid --disable-fsck --disable-rpath --with-gnu-ld --disable-makeinstall-chown" short_desc="Miscellaneous linux utilities" maintainer="Juan RP " -checksum=b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc +checksum=583c122245f301b8cdd27e37a7a1fc774fcf1a73c3d633d9eac0c165e9b573d6 long_desc=" - The util-linux-ng package contains miscellaneous utility programs. Among + The ${pkgname} package contains miscellaneous utility programs. Among them are utilities for handling file systems, consoles, partitions, and messages." -subpackages="libmount libmount-devel libblkid libblkid-devel -libuuid libuuid-devel" +replaces="util-linux-ng>=0" +subpackages="libmount libmount-devel libblkid libblkid-devel libuuid libuuid-devel" # Required by /var/lib/hwclock keep_empty_dirs=yes