diff --git a/common/shlibs b/common/shlibs index e2426e8ee57..803d95c8c49 100644 --- a/common/shlibs +++ b/common/shlibs @@ -602,7 +602,6 @@ libelf.so.1 libelf-0.155_1 libdw.so.1 libelf-0.155_1 libasm.so.1 libelf-0.155_1 libgtksourceview-3.0.so.0 gtksourceview-3.0.0_1 -libtalloc.so.1 talloc-2.0.1_1 libtalloc.so.2 talloc-2.0.1_1 libmount.so.1 libmount-2.18_1 libdconf.so.0 dconf-0.5.1_1 diff --git a/srcpkgs/talloc/talloc-devel.template b/srcpkgs/talloc/talloc-devel.template index 0af12941931..e34b6287b6e 100644 --- a/srcpkgs/talloc/talloc-devel.template +++ b/srcpkgs/talloc/talloc-devel.template @@ -1,16 +1,13 @@ # Template file for 'talloc-devel'. # -depends="pkg-config glibc-devel" +noarch=yes +depends="${sourcepkg}>=${version}" short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template index bdb09a88d9e..4493027313c 100644 --- a/srcpkgs/talloc/template +++ b/srcpkgs/talloc/template @@ -1,25 +1,17 @@ # Template build file for 'talloc'. pkgname=talloc -version=2.0.1 -distfiles="http://samba.org/ftp/$pkgname/$pkgname-$version.tar.gz" +version=2.0.8 +revision=1 +subpackages="talloc-devel" build_style=gnu-configure -configure_args="--enable-talloc-compat1 --enable-largefile" -revision=2 -makedepends="pkg-config libxslt docbook-xsl" +configure_args="--enable-talloc-compat1" +makedepends="pkg-config python libxslt docbook-xsl" short_desc="Hierarchical pool based memory allocator with destructors" maintainer="Juan RP " -checksum=5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4 +homepage="http://talloc.samba.org/" +license="GPL-3" +distfiles="http://samba.org/ftp/$pkgname/$pkgname-$version.tar.gz" +checksum=1ec11e635e0318dbbb014db38ff96e8dba3ce5f614eeb7d993b4a5b71c016783 long_desc=" This package provides the talloc library: an hierarchical pool based memory allocator with destructors." - -subpackages="$pkgname-devel" - -post_install() -{ - cd ${DESTDIR}/usr/lib && \ - ln -s libtalloc.so.${version} libtalloc.so.2.0 && \ - ln -s libtalloc.so.${version} libtalloc.so.2 && \ - ln -s libtalloc-compat1-${version}.so libtalloc.so.1 - -}