Accepting request 1326282 from Archiving

OBS-URL: https://build.opensuse.org/request/show/1326282
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avfs?expand=0&rev=13

avfs-1.1.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad9f3b64104d6009a058c70f67088f799309bf8519b14b154afad226a45272cf
-size 623927

avfs-1.1.5.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE+Sme6QpykCnnGvJrZnEy0PvFKzcFAmPxEzMACgkQZnEy0PvF
-KzfBOQ/5AWsci3/jUDEgHEPiza+XxrLW5b1vm/O4+jZjvQfTXIgzpCt+69M7SYVb
-JG0TW3CLvuerX6G+vjWq9oad8nezBximTp8Y0+4jchz29g5yKVasXzZFoQqjpRiY
-xukUgiq69oUOxctKhzvu/GORbZnuKksAkZbBCEzMh+uM0XXy6aDdvtSGj0HsPj1h
-+bYyUrN1VqMP7dCUuEx4gyQ8gO+ydU6d4VwOKx1/KCr+CbN+pLD1oRIV5RNfumSQ
-BBIOoSKR4hib1tY4Dx4fnBfPa+MJ1aWBugmMpfurAxFf5cShbWAVL7gWYNv1fWyk
-u0wOcavMLhvyA8e6M0EUhedSwR77hywiIc8pLwasvGFDr8cbgffnPTTUxC0sehZ5
-2ULFpYwAMTvoD3L87LmyG9siA6Pn/i0/WjlwYWHTGxi40FOmRcdZ+7sJK6qXGTTL
-Q9Uaf8Eb2F5Q/moUgk1s5MNCrRRix5Z/ls3uS2ZhW2ludbbTx/BpggM5ZBKA0UJR
-RkQvHTh4QM7iRJ+W7xGT5/qSbbQT+H5Ejr49tUBNb5zXvdZpCoEq5iL3HV68vrCR
-tw9sSboV0xlUdMArlqVMB3XgbDBKziz2fclKCKHkgWHP+2/CM9HAm2iWJ4ez1m1D
-5qNwQqrxif6l84fnO5wXbOSLUCJ3D34I1JIAEp3uIzRc6ovpUlM=
-=f8zi
------END PGP SIGNATURE-----

avfs-1.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a25a8ec43c1ee172624e1a4c79ce66a1b930841cdb545b725f1ec64bcabe889c
+size 630312

avfs-1.2.0.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE+Sme6QpykCnnGvJrZnEy0PvFKzcFAme3XLcACgkQZnEy0PvF
+KzctxQ/+LUA4iDKQWlUQR3Tu+Am7skCHfvv6l8S/BoMaBVThpsTeZsSNhwnaq5As
+wdTnsSjegWA63e8ce1AsCFH1oLnknBsvUjzlOuPXcoXOiu09sYucT0LOMykMOf5r
+gUdY/OlUnjOW179VwI+LP12rpwig9S8RIGU3p8R5azEtVQS6X50I7QrYQmBdB308
+m1wQLozbf+Qs6vmfc6ktcyoojiaTlMpgVJUc8/urT8wFpjKHeOvSGisz0sd/Uvb0
+rp1p2eskz93AdPBxXIOtLw5LUjvvKdZ4jtV0O0lZWT3Nb7skH+irDOK6hq7maPAj
+oqPs1NMOSZNnPn8vbDlvJ6wlsEm9NJkdpxzs3JdJr8w5rpF1l+SrZM1xllXIaf2m
+keOksOMwh0vNaCCvQZ07Z2334vKyj6KelZ9EPXqSCbX+WGJv3ZYPdkpL236gY+8G
+dBkJ8+OyRtFjj/ENaRrog5I0bRBL3FLZ7l5geEN15ZURcCqW0iC1A6gl5Q8D7JmA
+ds26pNt4MExtkzq/268x2qBdq1+8rAqGL6kLBdbhURI1DQaqI51DahZwWmlCQRBI
+CF/INLLBC14ptOndGfsHvmNVsvW2GC8dWR3o/XiyaExUXFcsMYdHpvf9L6vf1MoY
+KzOh1nC8OF9cACisbfM1mS2ijLa4SKlFVPQjVPHXJnGIvfg8B6s=
+=FWo4
+-----END PGP SIGNATURE-----

avfs-fuse3-support.patch

@@ -0,0 +1,363 @@
+From f7c2526778fc8323ff40137e7e3bcaab1d925020 Mon Sep 17 00:00:00 2001
+From: Ralf Hoffmann <ralf@boomerangsworld.de>
+Date: Fri, 19 Dec 2025 21:39:46 +0100
+Subject: [PATCH] add support for fuse3
+
+---
+ configure.ac | 34 +++++++++++++++++++++++-----------
+ fuse/avfsd.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
+ 2 files changed, 71 insertions(+), 15 deletions(-)
+
+!diff --git a/configure.ac b/configure.ac
+!index cd516a1..9e96097 100644
+!--- a/configure.ac
+!+++ b/configure.ac
+!@@ -288,24 +288,36 @@ if test $fuse_build = yes; then
+!   if test $run_fuse_test = yes; then
+!     AC_MSG_CHECKING([whether fuse is new enough])
+! 
+!-    pkg-config --atleast-version=2.6.0 fuse >/dev/null 2>/dev/null
+!-
+!-    if test $? != 0; then
+!-      dnl too old fuse or no fuse or no pkg-config
+!-      dnl in any case disable fuse_build
+!-      AC_MSG_RESULT([no])
+!-      fuse_build=no
+!-    else
+!+    pkg-config fuse3 >/dev/null 2>/dev/null
+!+    if test $? -eq 0; then
+!       AC_MSG_RESULT([yes])
+!+    else
+!+      pkg-config --atleast-version=2.6.0 fuse >/dev/null 2>/dev/null
+!+
+!+      if test $? -ne 0; then
+!+        dnl too old fuse or no fuse or no pkg-config
+!+        dnl in any case disable fuse_build
+!+        AC_MSG_RESULT([no])
+!+        fuse_build=no
+!+      else
+!+        AC_MSG_RESULT([yes])
+!+      fi
+!     fi
+!   fi
+! fi
+! 
+! if test $fuse_build = yes; then
+!     fuse_pkg_found=no
+!-    PKG_CHECK_EXISTS([fuse],[
+!-                     PKG_CHECK_MODULES([LIBFUSE],[fuse],
+!-                                       [fuse_pkg_found=yes])
+!+    PKG_CHECK_EXISTS([fuse3],[
+!+                     PKG_CHECK_MODULES([LIBFUSE],[fuse3],
+!+                                       [fuse_pkg_found=yes
+!+                                       AC_DEFINE(LIBFUSE_VERSION, 3, [Define to 2 or 3 according to libfuse major version])
+!+                                       ])
+!+                     ],
+!+                     [PKG_CHECK_MODULES([LIBFUSE],[fuse],
+!+                                        [fuse_pkg_found=yes
+!+                                         AC_DEFINE(LIBFUSE_VERSION, 2, [Define to 2 or 3 according to libfuse major version])
+!+                                        ])
+!                      ])
+! 
+!     if test "$fuse_pkg_found" = "yes" -o "$run_fuse_test" = "no"; then
+diff --git a/fuse/avfsd.c b/fuse/avfsd.c
+index c79cedc..9db9121 100644
+--- a/fuse/avfsd.c
++++ b/fuse/avfsd.c
+@@ -7,7 +7,12 @@
+     See the file COPYING.
+ */
+ 
+-#define FUSE_USE_VERSION 26
++#include "config.h"
++#if LIBFUSE_VERSION == 3
++#  define FUSE_USE_VERSION 31
++#else
++#  define FUSE_USE_VERSION 26
++#endif
+ 
+ #include <fuse.h>
+ #include <virtual.h>
+@@ -24,7 +29,11 @@ struct fuse *fuse;
+ 
+ static pthread_mutex_t avfsd_mutexlock = PTHREAD_MUTEX_INITIALIZER;
+ 
++#if LIBFUSE_VERSION == 3
++static int avfsd_getattr(const char *path, struct stat *stbuf, struct fuse_file_info *fi)
++#else
+ static int avfsd_getattr(const char *path, struct stat *stbuf)
++#endif
+ {
+     int res;
+ 
+@@ -48,8 +57,13 @@ static int avfsd_readlink(const char *path, char *buf, size_t size)
+ }
+ 
+ 
++#if LIBFUSE_VERSION == 3
++static int avfsd_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
++                         off_t offset, struct fuse_file_info *fi, enum fuse_readdir_flags flags)
++#else
+ static int avfsd_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+                          off_t offset, struct fuse_file_info *fi)
++#endif
+ {
+     DIR *dp;
+     struct dirent *de;
+@@ -65,8 +79,13 @@ static int avfsd_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+         memset(&st, 0, sizeof(st));
+         st.st_ino = de->d_ino;
+         st.st_mode = de->d_type << 12;
++#if LIBFUSE_VERSION == 3
++        if (filler(buf, de->d_name, &st, 0, FUSE_FILL_DIR_DEFAULTS))
++            break;
++#else
+         if (filler(buf, de->d_name, &st, 0))
+             break;
++#endif
+     }
+ 
+     virt_closedir(dp);
+@@ -128,7 +147,11 @@ static int avfsd_symlink(const char *from, const char *to)
+     return 0;
+ }
+ 
++#if LIBFUSE_VERSION == 3
++static int avfsd_rename(const char *from, const char *to, unsigned int flags)
++#else
+ static int avfsd_rename(const char *from, const char *to)
++#endif
+ {
+     int res;
+ 
+@@ -150,7 +173,11 @@ static int avfsd_link(const char *from, const char *to)
+     return 0;
+ }
+ 
++#if LIBFUSE_VERSION == 3
++static int avfsd_chmod(const char *path, mode_t mode, struct fuse_file_info *fi)
++#else
+ static int avfsd_chmod(const char *path, mode_t mode)
++#endif
+ {
+     int res;
+ 
+@@ -161,7 +188,11 @@ static int avfsd_chmod(const char *path, mode_t mode)
+     return 0;
+ }
+ 
++#if LIBFUSE_VERSION == 3
++static int avfsd_chown(const char *path, uid_t uid, gid_t gid, struct fuse_file_info *fi)
++#else
+ static int avfsd_chown(const char *path, uid_t uid, gid_t gid)
++#endif
+ {
+     int res;
+ 
+@@ -172,7 +203,11 @@ static int avfsd_chown(const char *path, uid_t uid, gid_t gid)
+     return 0;
+ }
+ 
++#if LIBFUSE_VERSION == 3
++static int avfsd_truncate(const char *path, off_t size, struct fuse_file_info *fi)
++#else
+ static int avfsd_truncate(const char *path, off_t size)
++#endif
+ {
+     int res;
+ 
+@@ -183,11 +218,20 @@ static int avfsd_truncate(const char *path, off_t size)
+     return 0;
+ }
+ 
+-static int avfsd_utime(const char *path, struct utimbuf *buf)
++#if LIBFUSE_VERSION == 3
++static int avfsd_utime(const char *path, const struct timespec tv[2],
++                       struct fuse_file_info *fi)
++#else
++static int avfsd_utime(const char *path, const struct timespec tv[2])
++#endif
+ {
+     int res;
+ 
+-    res = virt_utime(path, buf);
++    struct utimbuf buf;
++    buf.actime = tv[0].tv_sec;
++    buf.modtime = tv[1].tv_sec;
++
++    res = virt_utime(path, &buf);
+     if (res == -1)
+         return -errno;
+ 
+@@ -300,7 +344,7 @@ static struct fuse_operations avfsd_oper = {
+     chmod:	avfsd_chmod,
+     chown:	avfsd_chown,
+     truncate:	avfsd_truncate,
+-    utime:	avfsd_utime,
++    utimens:	avfsd_utime,
+     open:	avfsd_open,
+     read:	avfsd_read,
+     write:	avfsd_write,
+-- 
+2.51.0
+
+--- a/configure
++++ b/configure
+@@ -14585,15 +15342,21 @@ if test $fuse_build = yes; then
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fuse is new enough" >&5
+ printf %s "checking whether fuse is new enough... " >&6; }
+ 
+-    pkg-config --atleast-version=2.6.0 fuse >/dev/null 2>/dev/null
++    pkg-config fuse3 >/dev/null 2>/dev/null
++    if test $? -eq 0; then
++      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++printf "%s\n" "yes" >&6; }
++    else
++      pkg-config --atleast-version=2.6.0 fuse >/dev/null 2>/dev/null
+ 
+-    if test $? != 0; then
+-                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
++      if test $? -ne 0; then
++                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+-      fuse_build=no
+-    else
+-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++        fuse_build=no
++      else
++        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
++      fi
+     fi
+   fi
+ fi
+@@ -14601,12 +15364,104 @@ fi
+ if test $fuse_build = yes; then
+     fuse_pkg_found=no
+     if test -n "$PKG_CONFIG" && \
+-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
++    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse3\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "fuse3") 2>&5
++  ac_status=$?
++  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++
++
++pkg_failed=no
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBFUSE" >&5
++printf %s "checking for LIBFUSE... " >&6; }
++
++if test -n "$LIBFUSE_CFLAGS"; then
++    pkg_cv_LIBFUSE_CFLAGS="$LIBFUSE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse3\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "fuse3") 2>&5
++  ac_status=$?
++  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_LIBFUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse3" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++if test -n "$LIBFUSE_LIBS"; then
++    pkg_cv_LIBFUSE_LIBS="$LIBFUSE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse3\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "fuse3") 2>&5
+   ac_status=$?
+   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
++  pkg_cv_LIBFUSE_LIBS=`$PKG_CONFIG --libs "fuse3" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        LIBFUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fuse3" 2>&1`
++        else
++	        LIBFUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors "fuse3" 2>&1`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$LIBFUSE_PKG_ERRORS" >&5
++
++	as_fn_error $? "Package requirements (fuse3) were not met:
++
++$LIBFUSE_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+ 
++Alternatively, you may set the environment variables LIBFUSE_CFLAGS
++and LIBFUSE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
++printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables LIBFUSE_CFLAGS
++and LIBFUSE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See 'config.log' for more details" "$LINENO" 5; }
++else
++	LIBFUSE_CFLAGS=$pkg_cv_LIBFUSE_CFLAGS
++	LIBFUSE_LIBS=$pkg_cv_LIBFUSE_LIBS
++        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++printf "%s\n" "yes" >&6; }
++	fuse_pkg_found=yes
++
++printf "%s\n" "#define LIBFUSE_VERSION 3" >>confdefs.h
++
++
++fi
++
++else
+ 
+ pkg_failed=no
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBFUSE" >&5
+@@ -14692,6 +15547,10 @@ else
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
+ 	fuse_pkg_found=yes
++
++printf "%s\n" "#define LIBFUSE_VERSION 2" >>confdefs.h
++
++
+ fi
+ 
+ fi
+--- a/config.h.in
++++ b/config.h.in
+@@ -54,6 +54,9 @@
+ /* Define to 1 if you have the 'pthread' library (-lpthread). */
+ #undef HAVE_LIBPTHREAD
+ 
++/* libfuse version */
++#undef LIBFUSE_VERSION
++
+ /* Define to 1 if your system has libzstd installed */
+ #undef HAVE_LIBZSTD
+ 

avfs.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Jan  9 06:18:32 UTC 2026 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- fix openSUSE Leap build, using fuse 2 (boo#1256109)
+
+-------------------------------------------------------------------
+Wed Jan  7 10:32:03 UTC 2026 - Dr. Werner Fink <werner@suse.de>
+
+- Add patch avfs-fuse3-support.patch (boo#1256109)
+  * Support avfsd by porting upstream commit f7c2526778fc8323ff40137e7e3bcaab1d925020
+
+-------------------------------------------------------------------
+Sat May 10 20:57:27 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 1.2.0:
+  * fix decoding zip64 archives when some fields on regular header
+    are ff..ff
+  * extfs: replace temporary files from extfs archives if the
+    basefile has been changed or modified. Otherwise an inner
+    file would contain invalid old data from the previous basefile.
+  * virtual: add support in virt_readdir for longer names than
+    NAME_MAX
+  * developer visible fixes
+- simplify spec file
+- disable fuse, code was not ported to fuse 3 yet (boo#1242079)
+
 -------------------------------------------------------------------
 Tue Mar  7 19:57:08 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

avfs.spec

@@ -1,7 +1,8 @@
 #
 # spec file for package avfs
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2026 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,31 +17,35 @@
 #
 
 
+%define sover 1
+%if 0%{?suse_version} > 1600
+# Leap 16.0 fuse3 is not current enough
+%define fuse_version 3
+%else
+%define fuse_version 2
+%endif
 Name:           avfs
-Version:        1.1.5
+Version:        1.2.0
 Release:        0
 Summary:        AVFS - an archive look-inside filesystem
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-URL:            http://avf.sourceforge.net/
+URL:            https://avf.sourceforge.net/
 Source0:        https://downloads.sf.net/avf/%{name}-%{version}.tar.bz2
 Source1:        https://downloads.sf.net/avf/%{name}-%{version}.tar.bz2.asc
 Source2:        %{name}.keyring
-BuildRequires:  emacs-nox
-BuildRequires:  help2man
+Patch0:         %{name}-fuse3-support.patch
 BuildRequires:  lzlib-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(e2p)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(ext2fs)
-BuildRequires:  pkgconfig(fuse)
-BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(liblzma)
-BuildRequires:  pkgconfig(libssl)
-BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(neon)
-BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(zlib)
+%if %{fuse_version} == 3
+BuildRequires:  pkgconfig(fuse3) >= 3.17.1
+%else
+BuildRequires:  pkgconfig(fuse)
+%endif
 
 %description
 AVFS is a filesystem which enables all programs to look inside archived or
@@ -49,7 +54,7 @@ or changing the kernel.
 
 %package devel
 Summary:        Development files for AVFS, an archive look-inside filesystem
-Requires:       libavfs0 = %{version}
+Requires:       libavfs%{sover} = %{version}
 
 %description devel
 This package includes the development file for the package avfs.
@@ -57,77 +62,67 @@ AVFS is a filesystem which enables all programs to look inside archived or
 compressed files, or access remote files without recompiling the programs
 or changing the kernel.
 
-%package -n libavfs0
+%package -n libavfs%{sover}
 Summary:        Shared library for AVFS, an archive look-inside filesystem
 
-%description -n libavfs0
+%description -n libavfs%{sover}
 This package includes the runtime shared library for the package avfs.
 AVFS is a system, which enables all programs to look inside archived or
 compressed files, or access remote files without recompiling the programs
 or changing the kernel.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure \
   --disable-static \
-  --enable-fuse \
-  --enable-library \
   --enable-shared \
+  --enable-library \
   --with-system-zlib \
   --with-system-bzlib \
+  --enable-dav \
   --with-lzip \
-  --with-lzma \
-  --with-xz
+  --with-xz \
+  --with-zstd \
+  --enable-fuse \
+  %{nil}
 %make_build
 
 %install
 %make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 
-pushd %{buildroot}%{_libdir}/%{name}/extfs/
-    mv uzip ext-uzip
-popd
-mkdir -p %{buildroot}/%{_mandir}/man1/
-pushd %{buildroot}/%{_mandir}/man1/
-    LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-    PATH=%{buildroot}/%{_bindir}:$PATH \
-    help2man -s 1 -N --no-discard-stderr avfsd | \
-    sed 's/^FUSE \\- .*/AVFS - A Virtual File System/' > \
-    avfsd.1
-popd
+%check
+%make_build check
 
-rm -vf %{buildroot}/%{_libdir}/libavfs.la
-
-%post -n libavfs0 -p /sbin/ldconfig
-%postun -n libavfs0 -p /sbin/ldconfig
+%ldconfig_scriptlets -n libavfs%{sover}
 
 %files
-%doc ChangeLog README NEWS TODO
 %license COPYING
+%doc ChangeLog README NEWS TODO
 %doc doc/api-overview
 %doc doc/background
 %doc doc/FORMAT
-%doc doc/README.avfs-fuse
-%{_bindir}/avfsd
 %{_bindir}/davpass
 %{_bindir}/ftppass
+%{_bindir}/avfsd
 %{_bindir}/mountavfs
 %{_bindir}/umountavfs
 %dir %{_libdir}/avfs
 %dir %{_libdir}/avfs/extfs
 %{_libdir}/avfs/extfs/*
-%{_mandir}/man1/avfsd.1%{?ext_man}
 
 %files devel
+%license COPYING
 %{_bindir}/avfs-config
 %{_includedir}/avfs.h
 %{_includedir}/virtual.h
 %{_libdir}/libavfs.so
 %{_libdir}/pkgconfig/avfs.pc
 
-%files -n libavfs0
-%{_libdir}/libavfs.so.0
-%{_libdir}/libavfs.so.0.0.2
+%files -n libavfs%{sover}
+%license COPYING
+%{_libdir}/libavfs.so.%{sover}{,.*}
 
 %changelog