- new Source0, updated to 0.13.72

- removed obsolete test patch
- added fpe patch (fix division by zero on zero-size archive)

diff --git a/zziplib-fpe.patch b/zziplib-fpe.patch
new file mode 100644 (file)
index 0000000..307f755
--- /dev/null
+++ b/zziplib-fpe.patch
@@ -0,0 +1,11 @@
+--- zziplib-0.13.72/bins/unzip-mem.c.orig      2021-01-05 00:05:08.000000000 +0100
++++ zziplib-0.13.72/bins/unzip-mem.c   2022-02-06 18:37:25.525184220 +0100
+@@ -201,7 +201,7 @@ static void zzip_mem_entry_direntry_done
+     printf("--------  ------  ------- -----                           ----\n");
+     printf("%8li%c       %8li%c %3li%%                     %8li %s\n",
+          L sum_usize, exp, L sum_csize, exp, 
+-         L (100 - (sum_csize*100/sum_usize)), L sum_files, 
++         L (100 - (sum_usize == 0 ? 0 : (sum_csize*100/sum_usize))), L sum_files, 
+          sum_files == 1 ? "file" : "files");
+ }
+ 

diff --git a/zziplib-test.patch b/zziplib-test.patch
deleted file mode 100644 (file)
index 6a6ccd8..0000000
--- a/zziplib-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- zziplib-0.13.68/test/Makefile.am.orig      2018-02-05 21:00:56.000000000 +0100
-+++ zziplib-0.13.68/test/Makefile.am   2020-12-31 08:15:12.935029301 +0100
-@@ -47,8 +47,8 @@
- check-readme : $(zzcat)  test.zip
-       @ test -f test.zip || $(MAKE) tmp/../test.zip 
-       test -s test.zip
--      @ echo :$@: checking $(zzcat) test/README 
--      @ $(zzcat) test/README >test.out
-+      @ echo :$@: checking $(zzcat) $(README) 
-+      @ $(zzcat) $(README) >test.out
-       @ if diff test.out $(README) >$(NULL) \
-       ; then rm test.out ; echo check OK ; true \
-       ; else rm test.out ; echo check FAIL ; false ; fi

diff --git a/zziplib.spec b/zziplib.spec
index 9b6eb353b727b7c80efcc38bf5fd04bf461eecab..6f576be9a84680299d64a15fbc50c6c585fe401e 100644 (file)
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -5,14 +5,15 @@
 Summary:       ZZipLib - libZ-based ZIP-access Library
 Summary(pl.UTF-8):     ZZipLib - biblioteka dostępu do archiwów ZIP
 Name:          zziplib
-Version:       0.13.68
+Version:       0.13.72
 Release:       1
 Epoch:         1
 License:       LGPL v2 or MPL 1.1
 Group:         Libraries
-Source0:       http://downloads.sourceforge.net/zziplib/%{name}-%{version}.tar.bz2
-# Source0-md5: 8b0cc7c506b172a4938c3338b122c2f0
-Patch0:                %{name}-test.patch
+#Source0Download: https://github.com/gdraheim/zziplib/tags
+Source0:       https://github.com/gdraheim/zziplib/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 43555e7eafc5c1a1178a35e716c40500
+Patch0:                %{name}-fpe.patch
 Patch1:                %{name}-manpages.patch
 URL:           http://zziplib.sourceforge.net/
 BuildRequires: autoconf >= 2.61
@@ -89,14 +90,17 @@ Dokumentacja API biblioteki ZZipLib.
 %patch0 -p1
 %patch1 -p1
 
+# stick to autotools for now
+%{__mv} old.configure.ac configure.ac
+%{__rm} GNUmakefile
+
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
-       --disable-builddir
+%configure
 
 %{__make}
 %{__make} -j1 check
@@ -111,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with apidocs}
-%{__make} install-man3 -C docs \
+%{__make} -C docs install-man3 \
        DESTDIR=$RPM_BUILD_ROOT
 %endif