[arch-commits] Commit in fuse/trunk (PKGBUILD fuse.install)

[Tom Gundersen]

    Date: Wednesday, April 11, 2012 @ 09:11:17
  Author: tomegun
Revision: 156011

move from /lib to /usr/lib

also fixed:
 * no need for post-install message, as module loading and device node creation is done by udev/kernel
 * just delte udev rules, rather than first moving them to the right folder, and then deleting :)

Modified:
  fuse/trunk/PKGBUILD
Deleted:
  fuse/trunk/fuse.install

--------------+
 PKGBUILD     |   24 ++++++------------------
 fuse.install |   10 ----------
 2 files changed, 6 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-11 12:37:00 UTC (rev 156010)
+++ PKGBUILD	2012-04-11 13:11:17 UTC (rev 156011)
@@ -1,5 +1,6 @@
 # $Id$
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
 # Contributor: Mark Rosenstand <mark at archlinux.org>
 
 pkgname=fuse
@@ -8,11 +9,10 @@
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64')
 url="http://fuse.sourceforge.net/"
-license="GPL2"
+license=('GPL2')
 depends=('glibc')
 makedepends=('pkg-config')
 backup=(etc/fuse.conf)
-install=fuse.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
 options=(!libtool)
@@ -35,29 +35,17 @@
 
   make DESTDIR=${pkgdir} install
 
-  # static device nodes will cause collision.
-  rm -rf ${pkgdir}/dev
- 
   # Remove init script in wrong path
   # Don't add our own for now, as fusectl fs oopses on 2.6.18
   rm -rf ${pkgdir}/etc/init.d
   #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse
 
-  install -d ${pkgdir}/lib
-  mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/
-  ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver}
-  ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2
-  mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/
-  ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1
-  ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1
-
   # install sample config file
   install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
 
-  # Fix udev rule location
-  install -d -m755 "${pkgdir}/lib"
-  mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
+  # remove udev rules (is in the udev package}
+  rm -rf ${pkgdir}/etc/udev
 
-  # remove udev rules (should already be in udev package}
-  rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules
+  # static device nodes are handled by udev
+  rm -rf ${pkgdir}/dev
 }

Deleted: fuse.install
===================================================================
--- fuse.install	2012-04-11 12:37:00 UTC (rev 156010)
+++ fuse.install	2012-04-11 13:11:17 UTC (rev 156011)
@@ -1,10 +0,0 @@
-post_install() {
-  cat << 'EOM'
-==> You must load the fuse kernel module to use FUSE.
- -> Run 'modprobe fuse' to load the module now.
- -> Add fuse to $MODULES in /etc/rc.conf to load on every boot.
-==> You will need a /dev/fuse device node to use FUSE.
- -> If you use udev, nothing needs to be done
- -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229
-EOM
-}