diff --git a/srcpkgs/udisks/patches/01-mkfs-tempdir.patch b/srcpkgs/udisks/patches/01-mkfs-tempdir.patch deleted file mode 100644 index b72644bc8f..0000000000 --- a/srcpkgs/udisks/patches/01-mkfs-tempdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Description: Daemon does not create /var/run/udisks/, so mkfs jobs fail. -# Just create the directory in /tmp, this is what /tmp is for, after all. -# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=24265 - ---- src/helpers/job-mkfs.c 2010-12-05 23:08:54.587881164 +0100 -+++ src/helpers/job-mkfs.c 2010-12-05 23:09:12.399889312 +0100 -@@ -546,7 +546,7 @@ - /* take ownership of the device if requested */ - if (take_ownership_uid != 0 || take_ownership_gid != 0) - { -- char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX"; -+ char dir[256] = "/tmp/job-mkfs-XXXXXX"; - - if (mkdtemp (dir) == NULL) - { diff --git a/srcpkgs/udisks/template b/srcpkgs/udisks/template index f7401070ec..c0a1c8666e 100644 --- a/srcpkgs/udisks/template +++ b/srcpkgs/udisks/template @@ -1,7 +1,6 @@ # Template file for 'udisks' pkgname=udisks -version=1.0.3 -revision=2 +version=1.0.4 distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-static --localstatedir=/var --enable-lvm2" @@ -9,7 +8,7 @@ short_desc="Disk Management Service" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/udisks" license="GPL-2" -checksum=d95bceb52a70c727291b934c4c05774899a0074927c8138a219b81a784de8a4b +checksum=854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 long_desc=" The udisks project provides: @@ -47,16 +46,8 @@ Add_dependency build dbus-glib-devel Add_dependency build libgudev-devel Add_dependency build sg3_utils-devel -post_install() +pre_build() { # Fix location for bash completion stuff. - vmkdir etc/bash_completion.d - mv ${DESTDIR}/etc/profile.d/*.sh ${DESTDIR}/etc/bash_completion.d - chmod 644 ${DESTDIR}/etc/bash_completion.d/*.sh - rmdir ${DESTDIR}/etc/profile.d - - # Fix location of pkg-config files. - vmkdir usr/lib - mv ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib - rm -rf ${DESTDIR}/var/run + sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile }