first trial to move to new udisks, have 2 fully replace old version, xdg-utils update

This commit is contained in:
abveritas 2012-12-03 20:05:31 +00:00
parent 6ba4093039
commit bb68085f2d
2 changed files with 23 additions and 39 deletions

View File

@ -4,49 +4,33 @@
# maintainer abveritas@chakra-project.org # maintainer abveritas@chakra-project.org
pkgname=udisks pkgname=udisks
pkgver=1.0.4 pkgver=2.0.0
pkgrel=6 pkgrel=1
pkgdesc="Disk Management Service" pkgdesc="Disk Management Service"
arch=('x86_64') arch=('x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks" url="http://www.freedesktop.org/wiki/Software/udisks"
license=('GPL') license=('GPL')
depends=('systemd' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' depends=('systemd' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper'
'libatasmart' 'lsof' 'lvm2' 'util-linux') 'libatasmart' 'lsof' 'lvm2' 'util-linux')
makedepends=('intltool' 'docbook-xsl') makedepends=('intltool' 'docbook-xsl' 'python2' 'gobject-introspection')
options=(!libtool) options=(!libtool)
replaces=('devicekit-disks') replaces=('devicekit-disks')
source=("http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz" source=("http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2")
'udisks.service' md5sums=('79fb343fbec6ed6b9e76fbe828622d38')
'drop-pci-db.patch')
md5sums=('86c63b2b5484f2060499a052b5b6256b'
'5d80832b4d4da72beeb45c15b63a1481'
'2746c65d0d12fcc6a550b5a8d9085ab2')
build() { build() {
cd "${srcdir}/${pkgname}-${pkgver}" cd "${srcdir}/${pkgname}-${pkgver}"
# fix fail pci-db message, patch thanks to Tom Gundersen <teg@jklm.no>
patch -p1 -i ${srcdir}/drop-pci-db.patch
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/udisks --disable-static --with-systemdsystemunitdir=/usr/lib/systemd/system --disable-static
make make
} }
package() { package() {
cd "${srcdir}/${pkgname}-${pkgver}" cd "${srcdir}/${pkgname}-${pkgver}"
make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" bash_completiondir=/usr/share/bash-completion/completions
# move udev helpers and rules to /usr/lib
mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
rm -r "${pkgdir}"/lib
#fix ntfs mounts #fix ntfs mounts
sed -i -e 's|<allow_active>auth_admin_keep</allow_active>|<allow_active>yes</allow_active>|' ${pkgdir}/usr/share/polkit-1/actions/org.freedesktop.udisks.policy sed -i -e 's|<allow_active>auth_admin_keep</allow_active>|<allow_active>yes</allow_active>|' ${pkgdir}/usr/share/polkit-1/actions/org.freedesktop.udisks2.policy
# install systemd units
install -Dm644 "${srcdir}/udisks.service" "${pkgdir}/usr/lib/systemd/system/udisks.service"
echo "SystemdService=udisks.service" \
>> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service"
} }

View File

@ -1,34 +1,34 @@
# #
# Platform Packages for Chakra, part of chakra-project.org # Platform Packages for Chakra, part of chakra-project.org
# #
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org> # maintainer abveritas[at]chakra-project[dot]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=xdg-utils pkgname=xdg-utils
pkgver=1.1.0rc1 pkgver=1.1.0.1
_gitver=050333e34e2fe7430ad2ead37e5a0420ac0c2a3e
pkgrel=1 pkgrel=1
pkgdesc='Command line tools that assist applications with a variety of desktop integration tasks.' pkgdesc='Command line tools that assist applications with a variety of desktop integration tasks.'
arch=('any') arch=('any')
url='http://portland.freedesktop.org/' url='http://portland.freedesktop.org/'
depends=('sh') depends=('sh')
makedepends=('docbook-xsl' 'lynx' 'xmlto') makedepends=('docbook-xsl' 'lynx' 'xmlto')
optdepends=('xorg-utils: needed if using Xfce') license=('MIT')
license=('custom') source=("http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/xdg-utils-${_gitver}.tar.gz")
source=("http://portland.freedesktop.org/download/${pkgname}-${pkgver/rc1/-rc1}.tar.gz") md5sums=('eb6ddcae050ce3ecd2c8433e90f56247')
md5sums=('fadf5e7a08e0526fc60dbe3e5b7ef8d6')
build() { build() {
cd ${srcdir}/${pkgname}-${pkgver/rc1/-rc1} cd ${srcdir}/${pkgname}-${_gitver}
./configure --prefix=/usr --mandir=/usr/share/man ./configure --prefix=/usr --mandir=/usr/share/man
make -C scripts make scripts-clean -C scripts
make make man scripts -C scripts
} }
package() { package() {
#cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${_gitver}
cd ${srcdir}/${pkgname}-${pkgver/rc1/-rc1}
make DESTDIR=${pkgdir} install make DESTDIR="${pkgdir}" install
install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
} }
_source() { _source() {