From 20f985e7b0aa2cffe5706920b0c77bad5503ee2cb2ba4c06c72fc234d708bd32 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 2 Apr 2013 09:17:12 +0000
Subject: [PATCH] Accepting request 155731 from home:p_conrad:branches

Upgrade to upstream-1.4.7 + fixes for 12.2

OBS-URL: https://build.opensuse.org/request/show/155731
OBS-URL: https://build.opensuse.org/package/show/filesystems/davfs2?expand=0&rev=10
---
 davfs2-1.4.6.tar.bz2     |   3 -
 davfs2-1.4.7.tar.bz2     |   3 +
 davfs2-DESTDIR.patch     |  13 ++
 davfs2-fix-formats.patch | 253 +++++++++++++++++++++++++++++++++++++++
 davfs2.changes           |  24 ++++
 davfs2.spec              |  53 +++++---
 6 files changed, 332 insertions(+), 17 deletions(-)
 delete mode 100644 davfs2-1.4.6.tar.bz2
 create mode 100644 davfs2-1.4.7.tar.bz2
 create mode 100644 davfs2-DESTDIR.patch
 create mode 100644 davfs2-fix-formats.patch

diff --git a/davfs2-1.4.6.tar.bz2 b/davfs2-1.4.6.tar.bz2
deleted file mode 100644
index 181f96d..0000000
--- a/davfs2-1.4.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:926758198d543f751bf8ec7cdbec40d4fceb1a22567d34ad0fa4a5b96a5beb3e
-size 309607
diff --git a/davfs2-1.4.7.tar.bz2 b/davfs2-1.4.7.tar.bz2
new file mode 100644
index 0000000..90f960d
--- /dev/null
+++ b/davfs2-1.4.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:723f9d6f8de1a8ebf5b96cddfffae9f477e1ccef2b530487fd4e8a8cdc889828
+size 332994
diff --git a/davfs2-DESTDIR.patch b/davfs2-DESTDIR.patch
new file mode 100644
index 0000000..64a34c9
--- /dev/null
+++ b/davfs2-DESTDIR.patch
@@ -0,0 +1,13 @@
+--- Makefile.am	2012/08/03 19:39:35	1.7
++++ Makefile.am	2012/08/20 19:07:41	1.8
+@@ -56,8 +56,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:
diff --git a/davfs2-fix-formats.patch b/davfs2-fix-formats.patch
new file mode 100644
index 0000000..8a0c605
--- /dev/null
+++ b/davfs2-fix-formats.patch
@@ -0,0 +1,253 @@
+diff -rU3 davfs2-1.4.7/src/dav_coda.c davfs2-1.4.7.mine/src/dav_coda.c
+--- davfs2-1.4.7/src/dav_coda.c	2012-07-19 13:18:51.000000000 +0200
++++ davfs2-1.4.7.mine/src/dav_coda.c	2013-02-13 12:36:46.000000000 +0100
+@@ -21,6 +21,12 @@
+ #include "config.h"
+ 
+ #include <errno.h>
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#else
++#define PRIu64 "llu"
++#define PRIx64 "llx"
++#endif
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+@@ -661,7 +667,7 @@
+                in->attr.va_uid, in->attr.va_gid);
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  at %li, mt %li",
+                in->attr.va_atime.tv_sec, in->attr.va_mtime.tv_sec);
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  ct %li, sz %llu",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  ct %li, sz %" PRIu64,
+                in->attr.va_ctime.tv_sec, in->attr.va_size);
+     }
+ 
+diff -rU3 davfs2-1.4.7/src/dav_fuse.c davfs2-1.4.7.mine/src/dav_fuse.c
+--- davfs2-1.4.7/src/dav_fuse.c	2012-07-19 13:18:51.000000000 +0200
++++ davfs2-1.4.7.mine/src/dav_fuse.c	2013-02-13 12:36:34.000000000 +0100
+@@ -21,6 +21,12 @@
+ #include "config.h"
+ 
+ #include <errno.h>
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#else
++#define PRIu64 "llu"
++#define PRIx64 "llx"
++#endif
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+@@ -259,7 +265,7 @@
+         case FUSE_UNLINK:
+             if (debug) {
+                 syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_UNLINK:");
+-                syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%llx, %s",
++                syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%" PRIx64 ", %s",
+                        ih->nodeid,
+                        (char *) (buf + sizeof(struct fuse_in_header)));
+             }
+@@ -273,7 +279,7 @@
+         case FUSE_RMDIR:
+             if (debug) {
+                 syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_RMDIR:");
+-                syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%llx, %s",
++                syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%" PRIx64 ", %s",
+                        ih->nodeid,
+                        (char *) (buf + sizeof(struct fuse_in_header)));
+             }
+@@ -312,7 +318,7 @@
+         case FUSE_FSYNC:
+             if (debug) {
+                 syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_FSYNC:");
+-                syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx",
++                syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64,
+                 ih->nodeid);
+             }
+             oh->error = dav_sync((dav_node *) ((size_t) ih->nodeid));
+@@ -421,7 +427,7 @@
+     struct fuse_out_header *oh = (struct fuse_out_header *) buf;
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_ACCESS:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, f 0%o",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", f 0%o",
+                ih->nodeid, in->mask);
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  uid %i", ih->uid);
+     }
+@@ -449,7 +455,7 @@
+                              (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_CREATE:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, f 0%o",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", f 0%o",
+                ih->nodeid, in->flags);
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  pid %i, mode 0%o",
+                ih->pid, in->mode);
+@@ -523,7 +529,7 @@
+                                 (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_GETATTR:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx", ih->nodeid);
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64, ih->nodeid);
+     }
+ 
+     oh->error = dav_getattr((dav_node *) ((size_t) ih->nodeid), ih->uid);
+@@ -556,7 +562,7 @@
+     char *value = (char *) (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_GETXATTR:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, %s, %i",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", %s, %i",
+                ih->nodeid, name, in->size);
+     }
+ 
+@@ -636,7 +642,7 @@
+     char *value = (char *) (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_LISTXATTR:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, %i",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", %i",
+                ih->nodeid, in->size);
+     }
+ 
+@@ -676,7 +682,7 @@
+                                  (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_LOOKUP:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%llx, %s",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%" PRIx64 ", %s",
+                ih->nodeid, name);
+     }
+ 
+@@ -716,7 +722,7 @@
+                                  (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_MKDIR:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%llx, %s",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%" PRIx64 ", %s",
+                ih->nodeid, name);
+     }
+ 
+@@ -756,7 +762,7 @@
+                                  (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_MKNOD:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%llx, m 0%o",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  p 0x%" PRIx64 ", m 0%o",
+                ih->nodeid, in->mode);
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  %s", name);
+     }
+@@ -804,7 +810,7 @@
+         } else {
+             syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_OPEN:");
+         }
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, f 0%o",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", f 0%o",
+                ih->nodeid, in->flags);
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  pid %i, mode 0%o",
+                ih->pid, in->mode);
+@@ -844,10 +850,10 @@
+         } else {
+             syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_READ:");
+         }
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, fd %llu",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", fd %" PRIu64,
+                ih->nodeid, in->fh);
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  pid %i", ih->pid);
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  size %u, off %llu",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  size %u, off %" PRIu64,
+                in->size, in->offset);
+     }
+ 
+@@ -881,9 +887,9 @@
+         } else {
+             syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_RELEASE:");
+         }
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, f 0%o",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", f 0%o",
+                ih->nodeid, in->flags);
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  pid %i, fd %llu",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  pid %i, fd %" PRIu64,
+                ih->pid, in->fh);
+     }
+ 
+@@ -909,9 +915,9 @@
+     struct fuse_out_header *oh = (struct fuse_out_header *) buf;
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_RENAME:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  sp 0x%llx, %s",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  sp 0x%" PRIx64 ", %s",
+                ih->nodeid, old);
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  dp 0x%llx, %s",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  dp 0x%" PRIx64 ", %s",
+                in->newdir, new);
+     }
+ 
+@@ -938,13 +944,13 @@
+                                 (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_SETATTR:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, m 0%o",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", m 0%o",
+                ih->nodeid, in->mode);
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  uid %i, gid %i",
+                in->uid, in->gid);
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  sz %llu, at %llu,",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  sz %" PRIu64 ", at %" PRIu64 ",",
+                in->size, in->atime);
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  mt %llu", in->mtime);
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  mt %" PRIu64, in->mtime);
+     }
+ 
+     oh->error = dav_setattr((dav_node *) ((size_t) ih->nodeid), ih->uid,
+@@ -1022,11 +1028,11 @@
+                                  (buf + sizeof(struct fuse_out_header));
+     if (debug) {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "FUSE_WRITE:");
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%llx, fd %llu",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  n 0x%" PRIx64 ", fd %" PRIu64,
+                ih->nodeid, in->fh);
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  pid %i, flags 0%o",
+                ih->pid, in->write_flags);
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  size %u, off %llu",
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "  size %u, off %" PRIu64,
+                in->size, in->offset);
+     }
+ 
+diff -rU3 davfs2-1.4.7/src/mount_davfs.c davfs2-1.4.7.mine/src/mount_davfs.c
+--- davfs2-1.4.7/src/mount_davfs.c	2012-07-19 13:35:11.000000000 +0200
++++ davfs2-1.4.7.mine/src/mount_davfs.c	2013-02-13 12:33:27.000000000 +0100
+@@ -1278,10 +1278,9 @@
+ 
+     uid_t orig = geteuid();
+     seteuid(0);
+-    int ret;
+     FILE *mtab = setmntent(_PATH_MOUNTED, "a");
+     if (mtab) {
+-        ret = addmntent(mtab, &mntent);
++        addmntent(mtab, &mntent);
+         endmntent(mtab);
+     } else {
+         error(0, 0, _("Warning: can't write entry into mtab, but will mount "
+@@ -1829,7 +1828,7 @@
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
+            "  kernel_fs: %s", args->kernel_fs);
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
+-           "  buf_size: %i KiB", args->buf_size);
++           "  buf_size: %zu KiB", args->buf_size);
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
+            "  uid: %i", args->uid);
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
+@@ -1903,9 +1902,9 @@
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
+            "  backup_dir: %s", args->backup_dir);
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
+-           "  cache_size: %i MiB", args->cache_size);
++           "  cache_size: %zu MiB", args->cache_size);
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
+-           "  table_size: %i", args->table_size);
++           "  table_size: %zu", args->table_size);
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
+            "  dir_refresh: %li s", args->dir_refresh);
+     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
diff --git a/davfs2.changes b/davfs2.changes
index e32cbb3..27aaea9 100644
--- a/davfs2.changes
+++ b/davfs2.changes
@@ -1,3 +1,27 @@
+
+-------------------------------------------------------------------
+Fri Feb 15 17:41:17 UTC 2013 - conrad@quisquis.de
+- Specfile fixes for fedora + SLES
+
+-------------------------------------------------------------------
+Wed Feb 13 19:08:17 UTC 2013 - conrad@quisquis.de
+- Added missing file
+
+-------------------------------------------------------------------
+Wed Feb 13 18:51:17 UTC 2013 - conrad@quisquis.de
+- Added fix-formats patch to get rid of some warnings
+- Added upstream patch for broken symlinks
+
+-------------------------------------------------------------------
+Wed Feb 13 18:33:17 UTC 2013 - conrad@quisquis.de
+- Disabled OBS files service - apparently some savannah mirrors are broken
+
+-------------------------------------------------------------------
+Wed Feb 13 17:52:17 UTC 2013 - conrad@quisquis.de
+- Upgrade to 1.4.7
+- Added -pie/-fPIE compile flags
+- Fixed (hopefully) permissions handling
+
 -------------------------------------------------------------------
 Sat May 26 18:05:17 UTC 2012 - jengelh@inai.de
 
diff --git a/davfs2.spec b/davfs2.spec
index 544b33f..bfbdd28 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -1,16 +1,20 @@
 Summary:        FUSE-Filesystem to access WebDAV servers
 Name:           davfs2
-Version:        1.4.6
+Version:        1.4.7
 Release:        0
 License:        GPL-3.0
 Group:          System/Filesystems
 URL:            http://savannah.nongnu.org/projects/davfs2
-# http://mirrors.zerg.biz/nongnu/davfs2/davfs2-%{version}.tar.gz
+#Source:         http://download.savannah.gnu.org/releases/davfs2/davfs2-%%{version}.tar.gz
 Source:         davfs2-%{version}.tar.bz2
 Source1:        davfs.easy
 Source2:        davfs.secure
 Source99:       %{name}-rpmlintrc
 Patch1:         davfs2-fix_missing_exit_failure.patch
+# PATCH-FIX-UPSTREAM conrad@quisquis.de
+Patch2:         davfs2-fix-formats.patch
+# See http://cvs.savannah.gnu.org/viewvc/davfs2/src/Makefile.am?root=davfs2&r1=1.7&r2=1.8&view=patch
+Patch3:		davfs2-DESTDIR.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  fuse-devel >= 2.2, neon-devel
 BuildRequires:  pwdutils
@@ -19,6 +23,12 @@ Obsoletes:      fuse-davfs2 < %{version}
 Provides:       fuse-davfs2 = %{version}
 PreReq:         /usr/sbin/groupadd
 PreReq:         /usr/sbin/useradd
+%if 0%{?fedora} == 0
+Requires(pre): pwdutils
+Requires(pre): permissions
+%else
+Requires(pre): shadow-utils
+%endif
 
 %description
 davfs2 is a FUSE file system driver that allows you to mount a WebDAV server
@@ -33,6 +43,10 @@ Neon supports TLS/SSL (using OpenSSL or GnuTLS) and access via proxy server.
 %prep
 %setup -q -n "davfs2-%{version}"
 %patch1
+%patch2 -p 1
+cd src
+%patch3 -p 0
+%__patch Makefile.in <%{P:3}
 
 %build
 ssbindir="%{_sbindir}" \
@@ -40,10 +54,16 @@ dav_user="davfs2" \
 dav_group="davfs2" \
 %configure \
     --disable-static
-make %{?_smp_mflags}
+%if 0%{?suse_version} >= 1000
+PIE="-fPIE"
+pie="-pie"
+%endif
+make AM_CFLAGS="-Wall $PIE" AM_LDFLAGS="$pie" %{?_smp_mflags}
 
 %install
-%makeinstall
+%{?make_install}
+%{!?make_install:%__make DESTDIR=%{?buildroot} install}
+
 %__rm -rf "%{buildroot}%{_datadir}/doc"
 
 %__install -d "%{buildroot}/%{_sysconfdir}/permissions.d"
@@ -51,24 +71,29 @@ make %{?_smp_mflags}
 
 %__install -d "%{buildroot}/var/cache/davfs2"
 
-# fix symlinks
-pushd "%{buildroot}/sbin"
-for x in mount umount; do
-    %__rm "${x}.davfs"
-    %__ln_s "..%{_sbindir}/${x}.davfs" .
-done
-popd
-
 %find_lang davfs2
 
 %__rm -rf "%{buildroot}%{_docdir}"
 
+%__debug_install_post
+
 %pre
 /usr/bin/getent group davfs2 >/dev/null 2>&1 || /usr/sbin/groupadd -r davfs2 || :
 /usr/bin/getent passwd davfs2 >/dev/null 2>&1 || /usr/sbin/useradd -r -g davfs2 -d /var/cache/davfs2 davfs2 || :
 
 %post
-%run_permissions
+%if 0%{?set_permissions:1} > 0
+    %set_permissions "%{_sbindir}/mount.davfs"
+%else
+%if 0%{?run_permissions:1} > 0
+    %run_permissions
+%endif
+%endif
+
+%if 0%{?suse_version} >= 1120
+%verifyscript
+%verify_permissions -e %{_sbindir}/mount.davfs
+%endif
 
 %files -f davfs2.lang
 %defattr(-, root, root, 0755)
@@ -85,7 +110,7 @@ popd
 %config(noreplace) %{_sysconfdir}/davfs2/davfs2.conf
 %config %{_sysconfdir}/davfs2/secrets
 %config %{_sysconfdir}/davfs2/certs/
-%attr(4755,root,root) %{_sbindir}/mount.davfs
+%verify(not user group mode) %attr(4755,root,root) %{_sbindir}/mount.davfs
 %{_sbindir}/umount.davfs
 %{_datadir}/davfs2
 %attr(0750, davfs2, davfs2) /var/cache/davfs2