From 5fc61433e156777e840e4fc6c3d5183bb7a75ce6 Mon Sep 17 00:00:00 2001
From: dirkmueller <>
Date: Feb 07 2024 19:10:33 +0000
Subject: Update davfs2 to version 1.7.0 / rev 10 via SR 1144828


https://build.opensuse.org/request/show/1144828
by user dirkmueller + anag+factory

---

diff --git a/.files b/.files
index f3f1eca..ed5de06 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 8ac0c44..7758818 100644
--- a/.rev
+++ b/.rev
@@ -86,4 +86,12 @@
     <comment></comment>
     <requestid>1056147</requestid>
   </revision>
+  <revision rev="10" vrev="3">
+    <srcmd5>5bbc863e77809f0faacd58ca531e11e5</srcmd5>
+    <version>1.7.0</version>
+    <time>1707328219</time>
+    <user>anag+factory</user>
+    <comment></comment>
+    <requestid>1144828</requestid>
+  </revision>
 </revisionlist>
diff --git a/davfs2.changes b/davfs2.changes
index 4088eb2..f192dac 100644
--- a/davfs2.changes
+++ b/davfs2.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Mon Feb  5 08:13:44 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
+
+- Adapt to RPM 4.19 on Tumbleweed.
+
+-------------------------------------------------------------------
 Tue Dec 27 10:31:14 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
 
 - Replace transitional %usrmerged macro with regular version check (boo#1206798)
diff --git a/davfs2.spec b/davfs2.spec
index 98f7f9f..ece08ff 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package davfs2
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,15 +28,18 @@ Source1:        https://download.savannah.nongnu.org/releases/%{name}/%{name}-%{
 Source2:        %{name}-rpmlintrc
 # Taken from https://savannah.nongnu.org/project/release-gpgkeys.php?group=davfs2&download=1
 Source3:        davfs2.keyring
+Source4:        davfs2.sysusers
 BuildRequires:  automake >= 1.16
 BuildRequires:  fuse-devel >= 2.2
 BuildRequires:  neon-devel
 BuildRequires:  pwdutils
+BuildRequires:  sysuser-tools
 Requires:       fuse >= 2.2
 Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
 Obsoletes:      fuse-%{name} < %{version}
 Provides:       fuse-%{name} = %{version}
+%sysusers_requires
 
 %description
 davfs2 is a FUSE file system driver that allows mounting a WebDAV server
@@ -72,9 +75,11 @@ install -d "%{buildroot}%{_localstatedir}/cache/%{name}"
 %find_lang %{name}
 rm -rf "%{buildroot}/%{_docdir}"
 
-%pre
-%{_bindir}/getent group %{name} >/dev/null || %{_sbindir}/groupadd -r %{name}
-%{_bindir}/getent passwd %{name} >/dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/cache/%{name} %{name}
+install -p -D -m0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
+
+%sysusers_generate_pre %{buildroot}%{_sysusersdir}/%{name}.conf %{name} %{name}.conf
+
+%pre -f %{name}.pre
 
 %post
 %if 0%{?set_permissions:1} > 0
@@ -100,6 +105,7 @@ rm -rf "%{buildroot}/%{_docdir}"
 %{_mandir}/*/man5/%{name}.conf.5%{?ext_man}
 %{_mandir}/*/man8/mount.davfs.8%{?ext_man}
 %{_mandir}/*/man8/umount.davfs.8%{?ext_man}
+%{_sysusersdir}/%{name}.conf
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config %{_sysconfdir}/%{name}/secrets
diff --git a/davfs2.sysusers b/davfs2.sysusers
new file mode 100644
index 0000000..0d1318c
--- /dev/null
+++ b/davfs2.sysusers
@@ -0,0 +1,2 @@
+u davfs2 - "davfs2 user" /var/cache/davfs2  -
+g davfs2 - -             -                  -