[packages/avfs] up to 1.0.6

[atler]

commit 444eb55e544669ebfd4e4d6b69dff0d148077c4f
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Nov 25 15:01:09 2018 +0100

    up to 1.0.6

 avfs-unrar.c.patch | 50 --------------------------------------------------
 avfs.spec          | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 62 deletions(-)
---
diff --git a/avfs.spec b/avfs.spec
index 3e1aa76..d459397 100644
--- a/avfs.spec
+++ b/avfs.spec
@@ -4,19 +4,24 @@
 Summary:	AVFS - A Virtual Filesystem
 Summary(pl.UTF-8):	AVFS - wirtualny system plików
 Name:		avfs
-Version:	1.0.0
+Version:	1.0.6
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/avf/%{name}-%{version}.tar.gz
-# Source0-md5:	be6dd4417c3e96a294f1539ad22fddc9
-Patch0:		%{name}-unrar.c.patch
+Source0:	http://downloads.sourceforge.net/avf/%{name}-%{version}.tar.bz2
+# Source0-md5:	ad04a13afc4c01a50b7c945602926ce7
 URL:		http://sourceforge.net/projects/avf/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libfuse-devel >= 0:2.4
-#BuildRequires:	neon-devel >= 0.12
-#BuildRequires:	neon-devel < 0.13
-BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	bzip2-devel
+BuildRequires:	libfuse-devel >= 2.6.0
+BuildRequires:	libtool
+BuildRequires:	openssl-devel
+BuildRequires:	pkgconfig
+BuildRequires:	xz-devel
+BuildRequires:	zlib-devel
+BuildRequires:	zstd-devel
+Requires:	libfuse >= 2.6.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -67,15 +72,26 @@ Ten pakiet zawiera statyczną wersję biblioteki avfs.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.* .
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
+	EMACS=%{_bindir}/emacs \
+	PERL=%{_bindir}/perl \
+	ZIP=%{_bindir}/zip \
+	UNZIP=%{_bindir}/unzip \
 	--disable-avfscoda \
+	--disable-dav \
 	--enable-fuse \
 	--enable-library \
-	--with-ssl
+	--with-system-bzlib \
+	--with-system-zlib \
+	--with-xz \
+	--with-zstd
 # Comment:
 # I've no idea how to build this package with dav option with expat-devel  --blekot
 %{__make}
diff --git a/avfs-unrar.c.patch b/avfs-unrar.c.patch
deleted file mode 100644
index c68a91c..0000000
--- a/avfs-unrar.c.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur avfs-1.0.0.old/avfscoda/dispatch.c avfs-1.0.0/avfscoda/dispatch.c
---- avfs-1.0.0.old/avfscoda/dispatch.c	2012-03-22 18:29:17.000000000 +0000
-+++ avfs-1.0.0/avfscoda/dispatch.c	2012-03-22 18:31:09.000000000 +0000
-@@ -147,7 +147,7 @@
-     va_end(ap);
- 
-     buf[LOGMSG_SIZE] = '\0';
--    syslog(LOG_INFO, buf);
-+    syslog(LOG_INFO, "%s", buf);
-     log(buf);
- }
- 
-Only in avfs-1.0.0/avfscoda: dispatch.c~
-diff -ur avfs-1.0.0.old/modules/urar.c avfs-1.0.0/modules/urar.c
---- avfs-1.0.0.old/modules/urar.c	2012-03-22 18:29:17.000000000 +0000
-+++ avfs-1.0.0/modules/urar.c	2012-03-22 18:30:33.000000000 +0000
-@@ -587,7 +587,7 @@
-     if(res < 0)
-         return res;
- 
--    fd = open(tmpfile, O_RDWR | O_CREAT | O_TRUNC);
-+    fd = open(tmpfile, O_RDWR | O_CREAT | O_TRUNC,0644);
-     if(fd == -1) {
-         res = -errno; 
-         av_log(AVLOG_ERROR, "RAR: Could not open %s: %s", tmpfile,
-Only in avfs-1.0.0/modules: urar.c~
-diff -ur avfs-1.0.0.old/src/sysdeps.c avfs-1.0.0/src/sysdeps.c
---- avfs-1.0.0.old/src/sysdeps.c	2012-03-22 18:29:17.000000000 +0000
-+++ avfs-1.0.0/src/sysdeps.c	2012-03-22 18:31:34.000000000 +0000
-@@ -209,7 +209,7 @@
-     va_end(ap);
- 
-     if(logfile == NULL)
--        syslog(LOG_INFO, buf);
-+        syslog(LOG_INFO, "%s", buf);
-     else
-         filelog(buf);
-     AV_UNLOCK(loglock);
-Only in avfs-1.0.0/src: sysdeps.c~
---- avfs-1.0.0/libneon/hip_xml.c.old	2012-03-23 15:36:04.000000000 +0000
-+++ avfs-1.0.0/libneon/hip_xml.c	2012-03-23 15:36:20.000000000 +0000
-@@ -40,7 +40,7 @@
- 
- /******** Expat ***********/
- 
--# include "xmlparse.h"
-+# include "expat.h"
- typedef XML_Char hip_xml_char;
- 
- #else /* not HAVE_EXPAT */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/avfs.git/commitdiff/444eb55e544669ebfd4e4d6b69dff0d148077c4f