diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-07-30 19:24:37 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-07-30 19:24:37 (GMT) |
| commit | adc524ffa795c8a121ff90e6895d397c17b2d0f1 (patch) | |
| tree | 48571ee2f21b293175effe3bc997762de56c4871 | |
| parent | 9c9505429b54c286503d01cb1c8dba37243f1c27 (diff) | |
| parent | f0527f40d039f9266e31566bf9f1f659c3af6645 (diff) | |
| download | linhes_pkgbuild-adc524ffa795c8a121ff90e6895d397c17b2d0f1.zip linhes_pkgbuild-adc524ffa795c8a121ff90e6895d397c17b2d0f1.tar.gz linhes_pkgbuild-adc524ffa795c8a121ff90e6895d397c17b2d0f1.tar.bz2 | |
Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing
| -rw-r--r-- | abs/core/ntfs-3g/20-ntfs-config-write-policy.fdi | 13 | ||||
| -rw-r--r-- | abs/core/ntfs-3g/PKGBUILD | 16 | ||||
| -rw-r--r-- | abs/core/ntfs-3g/ntfs-3g.install | 15 |
3 files changed, 8 insertions, 36 deletions
diff --git a/abs/core/ntfs-3g/20-ntfs-config-write-policy.fdi b/abs/core/ntfs-3g/20-ntfs-config-write-policy.fdi deleted file mode 100644 index b0f5961..0000000 --- a/abs/core/ntfs-3g/20-ntfs-config-write-policy.fdi +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deviceinfo version="0.2"> - <device> - <match key="volume.fstype" string="ntfs"> - <merge key="volume.fstype" type="string">ntfs-3g</merge> - <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge> - <append key="volume.mount.valid_options" type="strlist">locale=</append> - <append key="volume.mount.valid_options" type="strlist">dmask=</append> - <append key="volume.mount.valid_options" type="strlist">fmask=</append> - </match> - </device> -</deviceinfo> - diff --git a/abs/core/ntfs-3g/PKGBUILD b/abs/core/ntfs-3g/PKGBUILD index 8c69b19..03a7168 100644 --- a/abs/core/ntfs-3g/PKGBUILD +++ b/abs/core/ntfs-3g/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82467 2010-06-11 12:01:11Z ronald $ +# $Id: PKGBUILD 94455 2010-10-07 10:35:38Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Bächler <thomas.archlinux.org> pkgname=ntfs-3g -pkgver=2010.5.22 +pkgver=2010.10.2 pkgrel=1 pkgdesc="Stable read and write NTFS driver" url="http://www.tuxera.com" @@ -14,20 +14,20 @@ makedepends=('pkgconfig') options=('!libtool') source=(http://www.tuxera.com/opensource/${pkgname}-${pkgver}.tgz 25-ntfs-config-write-policy.fdi) -sha1sums=('300c433dc455967a9b95009b89ef6931b3eae90e' +sha1sums=('97531dc0e556596e6bf2169863e9b8368c7d2bd0' '200029f2999a2c284fd30ae25734abf6459c3501') build() { cd "${srcdir}/${pkgname}-${pkgver}" ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \ - --with-fuse=external --disable-static || return 1 - make || return 1 + --with-fuse=external --disable-static + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs" || return 1 + make DESTDIR="${pkgdir}" install + ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs" install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor" - install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/" || return 1 + install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/" } diff --git a/abs/core/ntfs-3g/ntfs-3g.install b/abs/core/ntfs-3g/ntfs-3g.install deleted file mode 100644 index ad8cc1b..0000000 --- a/abs/core/ntfs-3g/ntfs-3g.install +++ /dev/null @@ -1,15 +0,0 @@ -# arg 1: the new package version -post_install() { - ln -s /sbin/mount.ntfs-3g /sbin/mount.ntfs -} -# arg 1: the new package version -# arg 2: the old package version - -# arg 1: the old package version -post_remove() { - rm -fr /sbin/mount.ntfs -} - -op=$1 -shift -$op $* |