[arch-commits] Commit in davfs2/repos (4 files)

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 12:15:44
  Author: jgc
Revision: 22396

Merged revisions 356,13758,22395 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/davfs2/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r13758 | allan | 2008-09-28 14:34:47 +0000 (Sun, 28 Sep 2008) | 1 line
  
  correct sourceforge url
........
  r22395 | jgc | 2008-12-26 17:15:30 +0000 (Fri, 26 Dec 2008) | 2 lines
  
  upgpkg: davfs2 1.3.3-1
      Fix FS#12565, remove install message, remove patches, fix symlinks
........

Modified:
  davfs2/repos/extra-i686/	(properties)
  davfs2/repos/extra-i686/PKGBUILD
Deleted:
  davfs2/repos/extra-i686/davfs2-neon.patch
  davfs2/repos/extra-i686/davfs2.install

-------------------+
 PKGBUILD          |   28 ++++++++++++++--------------
 davfs2-neon.patch |   26 --------------------------
 davfs2.install    |   19 -------------------
 3 files changed, 14 insertions(+), 59 deletions(-)


Property changes on: davfs2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /davfs2/trunk:1
   + /davfs2/trunk:1-22395

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-26 17:15:30 UTC (rev 22395)
+++ extra-i686/PKGBUILD	2008-12-26 17:15:44 UTC (rev 22396)
@@ -1,28 +1,28 @@
 # $Id$
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 pkgname=davfs2
-pkgver=1.3.0
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="File system driver that allows you to mount a WebDAV server as a local disk drive."
 arch=(i686 x86_64)
 url="http://dav.sourceforge.net"
-license="GPL"
-depends=('neon>=0.27.2')
+license=('GPL')
+depends=('neon>=0.28.3')
 backup=(etc/davfs2/davfs2.conf etc/davfs2/secrets)
-install=davfs2.install
-source=(http://mesh.dl.sourceforge.net/sourceforge/dav/$pkgname-$pkgver.tar.gz
-        davfs2-buildsystem.patch)
-md5sums=('944613c18338630399099601f00fa633'
-         'e4ac935855de9b99f06c6c3fc5d8efd5')
+source=(http://downloads.sourceforge.net/sourceforge/dav/${pkgname}-${pkgver}.tar.gz)
+md5sums=('57def26e4d6d63527e01612d10fd0515')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i $startdir/src/davfs2-buildsystem.patch || return 1
-  dav_user=nobody dav_group=network ./configure --prefix=/usr --sysconfdir=/etc --disable-debug
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  dav_user=nobody dav_group=network ./configure --prefix=/usr --sysconfdir=/etc --disable-debug || return 1
   make || return 1
   # Create some dirs
-  install -d -m755 $startdir/pkg/sbin
-  make DESTDIR=$startdir/pkg install || return 1
+  install -d -m755 "${pkgdir}/sbin"
+  make DESTDIR="${pkgdir}" install || return 1
 
-  rm -f $startdir/pkg/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS}
+  rm -f ${pkgdir}/sbin/{u,}mount.davfs
+  ln -sf /usr/sbin/mount.davfs "${pkgdir}/sbin/mount.davfs"
+  ln -sf /usr/sbin/umount.davfs "${pkgdir}/sbin/umount.davfs"
+
+  rm -f ${pkgdir}/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS}
 }

Deleted: extra-i686/davfs2-neon.patch
===================================================================
--- extra-i686/davfs2-neon.patch	2008-12-26 17:15:30 UTC (rev 22395)
+++ extra-i686/davfs2-neon.patch	2008-12-26 17:15:44 UTC (rev 22396)
@@ -1,26 +0,0 @@
-diff -Nur davfs2-1.2.2.orig/configure davfs2-1.2.2/configure
---- davfs2-1.2.2.orig/configure	2007-07-07 11:28:15.000000000 +0200
-+++ davfs2-1.2.2/configure	2007-08-25 11:56:54.000000000 +0200
-@@ -5546,7 +5546,7 @@
- echo "${ECHO_T}$ne_cv_lib_neon" >&6; }
-     if test "$ne_cv_lib_neon" = "yes"; then
-        ne_cv_lib_neonver=no
--       for v in 24 25 26; do
-+       for v in 24 25 26 27; do
-           case $ne_libver in
-           0.$v.*) ne_cv_lib_neonver=yes ;;
-           esac
-diff -Nur davfs2-1.2.2.orig/src/Makefile.in davfs2-1.2.2/src/Makefile.in
---- davfs2-1.2.2.orig/src/Makefile.in	2007-07-07 18:19:59.000000000 +0200
-+++ davfs2-1.2.2/src/Makefile.in	2007-08-25 12:02:18.000000000 +0200
-@@ -496,8 +496,8 @@
- 	chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; \
- 	if test "$(sbindir)" != "$(ssbindir)"; then \
- 	  $(mkinstalldirs) $(DESTDIR)$(ssbindir); \
--	  $(LN_S) -f $(DESTDIR)$(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \
--	  $(LN_S) -f $(DESTDIR)$(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \
-+	  $(LN_S) -f $(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \
-+	  $(LN_S) -f $(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \
- 	fi
- 
- uninstall-hook:

Deleted: extra-i686/davfs2.install
===================================================================
--- extra-i686/davfs2.install	2008-12-26 17:15:30 UTC (rev 22395)
+++ extra-i686/davfs2.install	2008-12-26 17:15:44 UTC (rev 22396)
@@ -1,19 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-post_install() {
-  cat << "EOF"
-
-To mount a WebDAV server, try mount -t davfs http://my.server.com /mnt/somewhere or man mount.davfs
-
-EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*