diff --git a/lz4-1.3.1+svn123.tar.xz b/lz4-1.3.1+svn123.tar.xz deleted file mode 100644 index 0091d7a..0000000 --- a/lz4-1.3.1+svn123.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adccdefe61a11da079bb45ac5ecff4f4c5a429064e4967da9995d999604d6365 -size 110804 diff --git a/lz4-1.4.0+svn124.tar.xz b/lz4-1.4.0+svn124.tar.xz new file mode 100644 index 0000000..dec7625 --- /dev/null +++ b/lz4-1.4.0+svn124.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0d2e1565a52b2c6e87005032f4523da8229ab56c595951e2b263dd7f99d8c6f +size 114636 diff --git a/lz4-killdate.diff b/lz4-killdate.diff index bbb2471..a05b7b1 100644 --- a/lz4-killdate.diff +++ b/lz4-killdate.diff @@ -1,3 +1,8 @@ +From: Jan Engelhardt +Date: 2014-11-28 20:01:01.723860722 +0100 + +lz4 management apparently changed the ABI in r124 (size of +LZ4_streamDecode_t changes) and did not update SO versioning. +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: trunk/Makefile +=================================================================== +--- trunk.orig/Makefile ++++ trunk/Makefile +@@ -65,9 +65,9 @@ ifeq ($(shell uname), Darwin) + SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT) + SONAME_FLAGS = -install_name $(PREFIX)/lib/liblz4.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER) + else +- SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR) ++ SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR).$(LIBVER_MINOR) + SHARED_EXT = so +- SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) ++ SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR).$(LIBVER_MINOR) + SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) + endif + diff --git a/lz4-use-shlib.diff b/lz4-use-shlib.diff index 40d5a8b..530ffec 100644 --- a/lz4-use-shlib.diff +++ b/lz4-use-shlib.diff @@ -1,3 +1,9 @@ +From: Jan Engelhardt +Date: 2014-10-01 14:23:22.000000000 +0200 + +build: make programs use liblz too instead of linking it statically + +Stop wasting my disk space! --- programs/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) @@ -6,9 +12,9 @@ Index: trunk/programs/Makefile =================================================================== --- trunk.orig/programs/Makefile +++ trunk/programs/Makefile -@@ -70,11 +70,11 @@ default: lz4 lz4c +@@ -65,11 +65,11 @@ default: lz4 lz4c - all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 frametest datagen + all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 frametest frametest32 datagen -lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c - $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) diff --git a/lz4.changes b/lz4.changes index b5756ec..ea3d07d 100644 --- a/lz4.changes +++ b/lz4.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Nov 28 19:02:06 UTC 2014 - jengelh@inai.de + +- Update to version 1.4+svn124 +* LZ4F_compressBound() may be called with NULL preferencesPtr +* LZ4_loadDict now returns the dictionary size instead of 1 + on success +- Add lz4-soversion.diff to address ABI changes + ------------------------------------------------------------------- Wed Oct 1 12:18:15 UTC 2014 - jengelh@inai.de diff --git a/lz4.spec b/lz4.spec index b5fb6af..8a81022 100644 --- a/lz4.spec +++ b/lz4.spec @@ -17,8 +17,8 @@ Name: lz4 -%define lname liblz4-1 -Version: 1.3.1+svn123 +%define lname liblz4-1_4 +Version: 1.4.0+svn124 Release: 0 Summary: Hash-based Predictive Lempel-Ziv compressor License: GPL-2.0+ and BSD-2-Clause @@ -31,6 +31,7 @@ Url: http://code.google.com/p/lz4/ Source: %name-%version.tar.xz Patch1: lz4-use-shlib.diff Patch2: lz4-killdate.diff +Patch3: lz4-soversion.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config BuildRequires: xz @@ -71,7 +72,7 @@ applications that want to make use of liblz4. %prep %setup -qn trunk -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build make %{?_smp_mflags} CFLAGS="%optflags"