diff --git a/srcpkgs/udisks/template b/srcpkgs/udisks/template index dde7c28a10..e78888a405 100644 --- a/srcpkgs/udisks/template +++ b/srcpkgs/udisks/template @@ -1,17 +1,19 @@ # Template file for 'udisks' pkgname=udisks version=1.0.4 -revision=8 -distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz" +revision=9 build_style=gnu-configure configure_args="--disable-static --enable-lvm2" depends="udev" -makedepends="pkg-config intltool libxslt docbook-xsl device-mapper-devel liblvm2app-devel libparted-devel libatasmart-devel polkit-devel dbus-glib-devel libgudev-devel>=183 sg3_utils-devel" +makedepends="pkg-config intltool libxslt docbook-xsl device-mapper-devel +liblvm2app-devel libparted-devel libatasmart-devel polkit-devel +dbus-glib-devel libgudev-devel>=183 sg3_utils-devel" make_dirs="/var/lib/udisks 0750 root root" short_desc="Disk Management Service" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/udisks" license="GPL-2" +distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz" checksum=854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 long_desc=" The udisks project provides: @@ -23,11 +25,17 @@ long_desc=" The actions that a user can perform using udisks are restricted using PolicyKit." +pre_configure() { + # Switch to /usr. + sed -i -e "s|\(slashlibdir\)=.*|\1=/usr/lib|g" \ + -e "s|\(slashsbindir\)=.*|\1=/usr/sbin|g" configure +} + pre_build() { # Fix location for bash completion stuff. sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile } post_install() { - vinstall ${FILESDIR}/udisks.service 644 lib/systemd/system + vinstall ${FILESDIR}/udisks.service 644 usr/lib/systemd/system } diff --git a/srcpkgs/udisks/udisks.rshlibs b/srcpkgs/udisks/udisks.rshlibs index 94286ea677..2075ac6a1b 100644 --- a/srcpkgs/udisks/udisks.rshlibs +++ b/srcpkgs/udisks/udisks.rshlibs @@ -1,5 +1,4 @@ libdbus-glib-1.so.2 -libpthread.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libc.so.6