libblkid: update to 2.16. Remove utils.

--HG--
extra : convert_revision : 1acbbbc24b4a681f5fdc3d5b580f17eb84611703
This commit is contained in:
Juan RP 2009-08-12 12:22:09 +02:00
parent 9913e38ff9
commit af06980ad6
3 changed files with 15 additions and 20 deletions

View file

@ -1,13 +1,13 @@
--- Makefile.in.orig 2009-05-13 04:24:38.602959508 +0200 --- Makefile.in.orig 2009-08-12 11:15:33.768923564 +0200
+++ Makefile.in 2009-05-13 04:25:11.570694167 +0200 +++ Makefile.in 2009-08-12 11:16:29.184473940 +0200
@@ -250,9 +250,7 @@ dist_noinst_DATA = $(dist_man_MANS) @@ -288,9 +288,7 @@ ul_libblkid_la = $(top_builddir)/shlibs/
# ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
-SUBDIRS = include disk-utils fdisk getopt lib libs login-utils \ -SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \
- misc-utils po schedutils sys-utils text-utils tests \ - misc-utils po schedutils sys-utils text-utils tests \
- $(am__append_1) $(am__append_2) $(am__append_3) - $(am__append_1) $(am__append_2) $(am__append_3)
+SUBDIRS = libs +SUBDIRS = shlibs
RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o

View file

@ -9,10 +9,6 @@ Add_dependency run libblkid
do_install() do_install()
{ {
mkdir -p ${DESTDIR}/usr/share/man ${DESTDIR}/lib ${DESTDIR}/usr/lib mkdir -p ${DESTDIR}
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr ${DESTDIR}
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
mv ${SRCPKGDESTDIR}/lib/*.*a ${DESTDIR}/lib
mv ${SRCPKGDESTDIR}/lib/*.so ${DESTDIR}/lib
} }

View file

@ -1,18 +1,17 @@
# Template file for 'libblkid' # Template file for 'libblkid'
pkgname=libblkid pkgname=libblkid
version=2.15 version=2.16
_utilng=util-linux-ng _utilng=util-linux-ng
wrksrc=${_utilng}-${version} wrksrc=${_utilng}-${version}
distfiles="${KERNEL_SITE}/utils/$pkgname/v2.15/${_utilng}-${version}.tar.bz2" distfiles="${KERNEL_SITE}/utils/$pkgname/v2.16/${_utilng}-${version}.tar.bz2"
build_style=gnu_configure build_style=gnu_configure
configure_args="--with-fsprobe=builtin" configure_args="--disable-libuuid --enable-libblkid"
short_desc="Library to handle device identification" short_desc="Library to handle device identification"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd checksum=a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722
long_desc=" long_desc="
The libblkid package contains a library to handle device identification The libblkid package contains a library to handle device identification
and token extraction, plus some utilities that use libblkid: findfs(8) and token extraction."
and blkid(8)."
subpackages="devel" subpackages="devel"
Add_dependency full glibc Add_dependency full glibc