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.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