- updated to 1.23 (GPL v3 now)

- added system-libs patch (use system libdeflate and zopfli)

diff --git a/advancecomp-system-libs.patch b/advancecomp-system-libs.patch
new file mode 100644 (file)
index 0000000..3273922
--- /dev/null
+++ b/advancecomp-system-libs.patch
@@ -0,0 +1,98 @@
+--- advancecomp-1.23/Makefile.am.orig  2016-11-21 18:28:02.000000000 +0100
++++ advancecomp-1.23/Makefile.am       2016-12-18 22:10:03.761097301 +0100
+@@ -21,32 +21,9 @@
+       7z/WindowIn.cc \
+       7z/WindowOut.cc
+ 
+-libdeflate_SOURCES = \
+-      libdeflate/adler32.c \
+-      libdeflate/aligned_malloc.c \
+-      libdeflate/crc32.c \
+-      libdeflate/deflate_compress.c \
+-      libdeflate/deflate_decompress.c \
+-      libdeflate/gzip_compress.c \
+-      libdeflate/gzip_decompress.c \
+-      libdeflate/x86_cpu_features.c \
+-      libdeflate/zlib_compress.c \
+-      libdeflate/zlib_decompress.c
+-
+-zopfli_SOURCES = \
+-      zopfli/blocksplitter.c \
+-      zopfli/cache.c \
+-      zopfli/deflate.c \
+-      zopfli/gzip_container.c \
+-      zopfli/hash.c \
+-      zopfli/katajainen.c \
+-      zopfli/lz77.c \
+-      zopfli/squeeze.c \
+-      zopfli/tree.c \
+-      zopfli/util.c \
+-      zopfli/zlib_container.c \
+-      zopfli/zopfli.h \
+-      zopfli/zopfli_lib.c
++libdeflate_LIBS = -ldeflate
++zopfli_LIBS = -lzopfli
++LDADD = $(libdeflate_LIBS) $(zopfli_LIBS)
+ 
+ advzip_SOURCES = \
+       rezip.cc \
+@@ -58,9 +35,7 @@
+       zipsh.cc \
+       getopt.c \
+       snprintf.c \
+-      $(7z_SOURCES) \
+-      $(libdeflate_SOURCES) \
+-      $(zopfli_SOURCES)
++      $(7z_SOURCES)
+ 
+ advpng_SOURCES = \
+       repng.cc \
+@@ -75,9 +50,7 @@
+       lib/png.c \
+       lib/error.c \
+       lib/snstring.c \
+-      $(7z_SOURCES) \
+-      $(libdeflate_SOURCES) \
+-      $(zopfli_SOURCES)
++      $(7z_SOURCES)
+ 
+ advmng_SOURCES = \
+       remng.cc \
+@@ -95,9 +68,7 @@
+       lib/mng.c \
+       lib/error.c \
+       lib/snstring.c \
+-      $(7z_SOURCES) \
+-      $(libdeflate_SOURCES) \
+-      $(zopfli_SOURCES)
++      $(7z_SOURCES)
+ 
+ advdef_SOURCES = \
+       redef.cc \
+@@ -113,9 +84,7 @@
+       lib/snstring.c \
+       lib/png.c \
+       lib/mng.c \
+-      $(7z_SOURCES) \
+-      $(libdeflate_SOURCES) \
+-      $(zopfli_SOURCES)
++      $(7z_SOURCES)
+ 
+ EXTRA_DIST = \
+       README AUTHORS HISTORY INSTALL COPYING \
+--- advancecomp-1.23/compress.h.orig   2016-09-26 22:04:03.000000000 +0200
++++ advancecomp-1.23/compress.h        2016-12-18 22:11:26.444429691 +0100
+@@ -24,11 +24,11 @@
+ #include "7z/7z.h"
+ 
+ extern "C" {
+-#include "libdeflate/libdeflate.h"
++#include <libdeflate.h>
+ }
+ 
+ extern "C" {
+-#include "zopfli/zopfli.h"
++#include <zopfli.h>
+ }
+ 
+ #if USE_BZIP2

diff --git a/advancecomp.spec b/advancecomp.spec
index 92ccfbe5160fe162322e5959f18a53a115537605..05f435998827d92cfcb0b49ef23770f5c32f7f16 100644 (file)
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -5,16 +5,21 @@
 Summary:       Recompression utilities for .ZIP archives, .PNG snapshots, .MNG video clips and .gz files
 Summary(pl.UTF-8):     Narzędzia rekompresujące pliki ZIP, PNG, MNG, gz
 Name:          advancecomp
-Version:       1.15
+Version:       1.23
 Release:       1
-License:       GPL v2+
+License:       GPL v3+
 Group:         Applications/File
 Source0:       http://downloads.sourceforge.net/advancemame/%{name}-%{version}.tar.gz
-# Source0-md5: bb236d8bee6fa473d34108cda1e09076
+# Source0-md5: 39a205f0ba1baa26550fccc6405a6b45
+Patch0:                %{name}-system-libs.patch
 URL:           http://advancemame.sourceforge.net/comp-readme.html
+BuildRequires: autoconf >= 2.65
+BuildRequires: automake
 %{?with_bzip2:BuildRequires:   bzip2-devel}
+BuildRequires: libdeflate-devel
 BuildRequires: libstdc++-devel
 BuildRequires: zlib-devel
+BuildRequires: zopfli-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,8 +48,13 @@ Głównymi cechami są:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        %{?with_bzip2:--enable-bzip2}
 %{__make}