xfsprogs: remove -libs subpkg, useless. Move stuff to /usr.
This commit is contained in:
parent
3c34267d30
commit
10fc008606
8 changed files with 12 additions and 21 deletions
|
@ -419,7 +419,6 @@ libQtDesigner.so.4 qt-designer qt-devel
|
||||||
libsysfs.so.2 libsysfs libsysfs-devel
|
libsysfs.so.2 libsysfs libsysfs-devel
|
||||||
libsensors.so.4 libsensors libsensors-devel
|
libsensors.so.4 libsensors libsensors-devel
|
||||||
libcap-ng.so.0 libcap-ng libcap-ng-devel
|
libcap-ng.so.0 libcap-ng libcap-ng-devel
|
||||||
libhandle.so.1 xfsprogs-libs xfsprogs-devel
|
|
||||||
libphysfs.so.1 physfs physfs-devel
|
libphysfs.so.1 physfs physfs-devel
|
||||||
libSDL_ttf-2.0.so.0 SDL_ttf SDL_ttf-devel
|
libSDL_ttf-2.0.so.0 SDL_ttf SDL_ttf-devel
|
||||||
libparted.so.1 libparted libparted-devel
|
libparted.so.1 libparted libparted-devel
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
xfsprogs
|
|
|
@ -1,2 +1,2 @@
|
||||||
abi_depends=">=3.0.3"
|
abi_depends=">=3.0.3"
|
||||||
api_depends="${abi_depends}"
|
api_depends=">=3.1.7_2"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
# Template file for 'xfsprogs'
|
# Template file for 'xfsprogs'
|
||||||
pkgname=xfsprogs
|
pkgname=xfsprogs
|
||||||
version=3.1.7
|
version=3.1.7
|
||||||
|
revision=1
|
||||||
homepage="http://oss.sgi.com/projects/xfs/"
|
homepage="http://oss.sgi.com/projects/xfs/"
|
||||||
distfiles="http://ftp.archlinux.org/other/xfsprogs/$pkgname-$version.tar.gz"
|
distfiles="http://ftp.archlinux.org/other/xfsprogs/$pkgname-$version.tar.gz"
|
||||||
short_desc="Utilities for managing the XFS filesystem"
|
short_desc="Utilities for managing the XFS filesystem"
|
||||||
|
@ -16,8 +17,10 @@ long_desc="
|
||||||
based, and makes extensive use of Btrees (directories, extents, free space)
|
based, and makes extensive use of Btrees (directories, extents, free space)
|
||||||
to aid both performance and scalability."
|
to aid both performance and scalability."
|
||||||
|
|
||||||
|
replaces="xfsprogs-libs>=0"
|
||||||
|
|
||||||
disable_parallel_build=yes
|
disable_parallel_build=yes
|
||||||
subpackages="$pkgname-libs $pkgname-devel"
|
subpackages="$pkgname-devel"
|
||||||
|
|
||||||
Add_dependency build gawk
|
Add_dependency build gawk
|
||||||
Add_dependency build gettext
|
Add_dependency build gettext
|
||||||
|
@ -27,7 +30,7 @@ Add_dependency build readline-devel
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
export DEBUG=-DNDEBUG
|
export DEBUG=-DNDEBUG
|
||||||
./configure --libdir=/usr/lib --libexecdir=/usr/lib \
|
./configure ${CONFIGURE_SHARED_ARGS} \
|
||||||
--enable-readline=yes --enable-blkid=yes --enable-lib64=no
|
--enable-readline=yes --enable-blkid=yes --enable-lib64=no
|
||||||
make ${makejobs}
|
make ${makejobs}
|
||||||
}
|
}
|
||||||
|
@ -38,4 +41,8 @@ do_install() {
|
||||||
rm -rf ${DESTDIR}/usr/share/doc
|
rm -rf ${DESTDIR}/usr/share/doc
|
||||||
rm -f ${DESTDIR}/usr/share/man/man5/proj*
|
rm -f ${DESTDIR}/usr/share/man/man5/proj*
|
||||||
rm -f ${DESTDIR}/lib/*.{a,la}
|
rm -f ${DESTDIR}/lib/*.{a,la}
|
||||||
|
rm -f ${DESTDIR}/usr/lib/*.so
|
||||||
|
# Move stuff to /usr.
|
||||||
|
vmove "sbin/*" usr/sbin
|
||||||
|
vmove "lib/*" usr/lib
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,10 +5,10 @@ long_desc="${long_desc}
|
||||||
|
|
||||||
This package contains files for development, headers, static libs, etc."
|
This package contains files for development, headers, static libs, etc."
|
||||||
|
|
||||||
revision=1
|
revision=2
|
||||||
|
|
||||||
Add_dependency run libuuid-devel
|
Add_dependency run libuuid-devel
|
||||||
Add_dependency run xfsprogs-libs
|
Add_dependency run xfsprogs ">=3.1.7_1"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
vmove usr/include usr
|
vmove usr/include usr
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
libc.so.6
|
|
|
@ -1,12 +0,0 @@
|
||||||
# Template file for 'xfsprogs-libs'.
|
|
||||||
#
|
|
||||||
short_desc="${short_desc} (shared libraries)"
|
|
||||||
long_desc="${long_desc}
|
|
||||||
|
|
||||||
This package contains the shared libraries."
|
|
||||||
|
|
||||||
revision=1
|
|
||||||
|
|
||||||
do_install() {
|
|
||||||
vmove "lib/*.so*" usr/lib
|
|
||||||
}
|
|
|
@ -4,4 +4,3 @@ libpthread.so.0
|
||||||
libc.so.6
|
libc.so.6
|
||||||
libblkid.so.1
|
libblkid.so.1
|
||||||
libreadline.so.6
|
libreadline.so.6
|
||||||
libhandle.so.1
|
|
||||||
|
|
Loading…
Reference in a new issue