From 99d039b750b61e123b10ab599ba1e1da6e15c6e803a5ce6664b0de5863fb167d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Apr 2016 19:30:27 +0000 Subject: [PATCH 1/5] - Update to new upstream release 131 (library 1.7) OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=18 --- lz4-1.4.0+svn124.tar.xz | 3 --- lz4-killdate.diff | 22 ++++++++--------- lz4-soversion.diff | 24 ++++++++++--------- lz4-use-shlib.diff | 31 ++++++++++++------------ lz4.changes | 9 +++++++ lz4.spec | 53 ++++++++++++++++++++++------------------- r131.tar.gz | 3 +++ 7 files changed, 79 insertions(+), 66 deletions(-) delete mode 100644 lz4-1.4.0+svn124.tar.xz create mode 100644 r131.tar.gz diff --git a/lz4-1.4.0+svn124.tar.xz b/lz4-1.4.0+svn124.tar.xz deleted file mode 100644 index dec7625..0000000 --- a/lz4-1.4.0+svn124.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0d2e1565a52b2c6e87005032f4523da8229ab56c595951e2b263dd7f99d8c6f -size 114636 diff --git a/lz4-killdate.diff b/lz4-killdate.diff index a05b7b1..177f77a 100644 --- a/lz4-killdate.diff +++ b/lz4-killdate.diff @@ -8,11 +8,11 @@ build: stop causing rebuilds on our side programs/lz4cli.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: trunk/programs/fullbench.c +Index: lz4-r131/programs/fullbench.c =================================================================== ---- trunk.orig/programs/fullbench.c -+++ trunk/programs/fullbench.c -@@ -107,7 +107,7 @@ +--- lz4-r131.orig/programs/fullbench.c ++++ lz4-r131/programs/fullbench.c +@@ -103,7 +103,7 @@ # define LZ4_VERSION "" #endif #define AUTHOR "Yann Collet" @@ -21,16 +21,16 @@ Index: trunk/programs/fullbench.c #define NBLOOPS 6 #define TIMELOOP 2500 -Index: trunk/programs/lz4cli.c +Index: lz4-r131/programs/lz4cli.c =================================================================== ---- trunk.orig/programs/lz4cli.c -+++ trunk/programs/lz4cli.c -@@ -116,7 +116,7 @@ - # define LZ4_VERSION "r122" +--- lz4-r131.orig/programs/lz4cli.c ++++ lz4-r131/programs/lz4cli.c +@@ -90,7 +90,7 @@ + # define LZ4_VERSION "r128" #endif #define AUTHOR "Yann Collet" -#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), LZ4_VERSION, AUTHOR, __DATE__ +#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), LZ4_VERSION, AUTHOR, "SUSE" #define LZ4_EXTENSION ".lz4" - #define LZ4_CAT "lz4cat" - + #define LZ4CAT "lz4cat" + #define UNLZ4 "unlz4" diff --git a/lz4-soversion.diff b/lz4-soversion.diff index e345030..0366e86 100644 --- a/lz4-soversion.diff +++ b/lz4-soversion.diff @@ -1,25 +1,27 @@ 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. +lz4 repeatedly changed the ABI without updating the SONAME +in r124 (size of LZ4_streamDecode_t changes) --- - Makefile | 4 ++-- + lib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: trunk/Makefile +Index: lz4-r131/lib/Makefile =================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -65,9 +65,9 @@ ifeq ($(shell uname), Darwin) +--- lz4-r131.orig/lib/Makefile ++++ lz4-r131/lib/Makefile +@@ -50,11 +50,11 @@ INCLUDEDIR=$(PREFIX)/include + # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html + ifeq ($(shell uname), Darwin) + SHARED_EXT = dylib +- SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT) ++ SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(LIBVER_MINOR).$(SHARED_EXT) 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_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) - endif - diff --git a/lz4-use-shlib.diff b/lz4-use-shlib.diff index 530ffec..6285818 100644 --- a/lz4-use-shlib.diff +++ b/lz4-use-shlib.diff @@ -1,30 +1,29 @@ From: Jan Engelhardt Date: 2014-10-01 14:23:22.000000000 +0200 -build: make programs use liblz too instead of linking it statically +build: make programs use liblz too instead of duplicating object code. -Stop wasting my disk space! --- programs/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: trunk/programs/Makefile +Index: lz4-r131/programs/Makefile =================================================================== ---- trunk.orig/programs/Makefile -+++ trunk/programs/Makefile -@@ -65,11 +65,11 @@ default: lz4 lz4c +--- lz4-r131.orig/programs/Makefile ++++ lz4-r131/programs/Makefile +@@ -72,11 +72,11 @@ bins: lz4 lz4c fullbench fuzzer frametes - all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 frametest frametest32 datagen + all: bins m32 --lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c -- $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -+lz4: $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c -+ $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4 - --lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c +-lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c - $(CC) $(FLAGS) $^ -o $@$(EXT) -+lz4c : $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c ++lz4: bench.c lz4io.c lz4cli.c + $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 - lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c - $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) +-lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c +- $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) ++lz4c : bench.c lz4io.c lz4cli.c ++ $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c + $(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) diff --git a/lz4.changes b/lz4.changes index ea3d07d..f35e312 100644 --- a/lz4.changes +++ b/lz4.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Apr 2 19:26:32 UTC 2016 - jengelh@inai.de + +- Update to new upstream release 131 (library 1.7) +* slightly improved decoding speed +* lz4frame API is included in liblz4 +* new -m command line option to compress multiple files +* new lz4 and lz4hc compression API (old one retained) + ------------------------------------------------------------------- Fri Nov 28 19:02:06 UTC 2014 - jengelh@inai.de diff --git a/lz4.spec b/lz4.spec index 8a81022..fc86476 100644 --- a/lz4.spec +++ b/lz4.spec @@ -1,7 +1,7 @@ # # spec file for package lz4 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,27 @@ Name: lz4 -%define lname liblz4-1_4 -Version: 1.4.0+svn124 +%define lname liblz4-1_7 +Version: 131 Release: 0 -Summary: Hash-based Predictive Lempel-Ziv compressor +Summary: Hash-based Predictive Lempel–Ziv compressor License: GPL-2.0+ and BSD-2-Clause Group: Productivity/Archiving/Compression -Url: http://code.google.com/p/lz4/ -#URL: http://fastcompression.blogspot.com/p/lz4.html +Url: http://lz4.org/ -#SVN-Clone: http://lz4.googlecode.com/svn/trunk -# Project offers no source tarballs. -Source: %name-%version.tar.xz -Patch1: lz4-use-shlib.diff -Patch2: lz4-killdate.diff -Patch3: lz4-soversion.diff +#Git-Clone: https://github.com/Cyan4973/lz4 +Source: https://github.com/Cyan4973/lz4/archive/r%version.tar.gz +Patch1: lz4-soversion.diff +Patch2: lz4-use-shlib.diff +Patch3: lz4-killdate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config -BuildRequires: xz %description -LZ4 is a very fast compressor, based on well-known LZ77 (Lempel-Ziv) -algorithm. It is a LZP2 fork and provides better compression ratio -for text files. +LZ4 is a lossless data compression algorithm that is focused on +compression and decompression speed. It belongs to the LZ77 +(Lempel–Ziv) family of byte-oriented compression schemes. It is a +LZP2 fork and provides better compression ratio for text files. This subpackage provides a GPL command-line utility to make use of the LZ4 algorithm. @@ -50,9 +48,9 @@ License: BSD-2-Clause Group: System/Libraries %description -n %lname -LZ4 is a very fast compressor, based on well-known LZ77 (Lempel-Ziv) -algorithm. It is a LZP2 fork and provides better compression ratio -for text files. +LZ4 is a lossless data compression algorithm that is focused on +compression and decompression speed. It belongs to the LZ77 +(Lempel–Ziv) family of byte-oriented compression schemes. It is a This subpackage contains the (de)compressor code as a shared library. @@ -63,22 +61,26 @@ Group: Development/Libraries/C and C++ Requires: %lname = %version %description -n liblz4-devel -LZ4 is a very fast compressor, based on well-known LZ77 (Lempel-Ziv) -algorithm. It is a LZP2 fork and provides better compression ratio -for text files. +LZ4 is a lossless data compression algorithm that is focused on +compression and decompression speed. It belongs to the LZ77 +(Lempel–Ziv) family of byte-oriented compression schemes. It is a This subpackage contains libraries and header files for developing applications that want to make use of liblz4. %prep -%setup -qn trunk +%setup -qn %name-r%version %patch -P 1 -P 2 -P 3 -p1 %build -make %{?_smp_mflags} CFLAGS="%optflags" +# Goddammit, lz4 +perl -i -pe 's{^\t@}{\t}g' Makefile */Makefile + +make -C lib %{?_smp_mflags} CFLAGS="%optflags" +make -C programs %{?_smp_mflags} CFLAGS="%optflags" lz4 lz4c %install -make install DESTDIR="%buildroot" LIBDIR="%_libdir" +make install DESTDIR="%buildroot" PREFIX="%_prefix" LIBDIR="%_libdir" rm -f "%buildroot/%_libdir"/*.a %post -n %lname -p /sbin/ldconfig @@ -87,6 +89,7 @@ rm -f "%buildroot/%_libdir"/*.a %files %defattr(-,root,root) %_bindir/lz4* +%_bindir/unlz4 %_mandir/man1/*.1* %files -n %lname diff --git a/r131.tar.gz b/r131.tar.gz new file mode 100644 index 0000000..1ad9729 --- /dev/null +++ b/r131.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed +size 133784 From 3f17948b3e87b754c4e88f0767f1b8e45f52f64d862433d67f5b45c23cbb3e9f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Apr 2016 19:43:04 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=19 --- lz4-soversion.diff | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lz4-soversion.diff b/lz4-soversion.diff index 0366e86..adbd20f 100644 --- a/lz4-soversion.diff +++ b/lz4-soversion.diff @@ -4,24 +4,28 @@ Date: 2014-11-28 20:01:01.723860722 +0100 lz4 repeatedly changed the ABI without updating the SONAME in r124 (size of LZ4_streamDecode_t changes) --- - lib/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + lib/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) Index: lz4-r131/lib/Makefile =================================================================== --- lz4-r131.orig/lib/Makefile +++ lz4-r131/lib/Makefile -@@ -50,11 +50,11 @@ INCLUDEDIR=$(PREFIX)/include +@@ -50,13 +50,13 @@ INCLUDEDIR=$(PREFIX)/include # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html ifeq ($(shell uname), Darwin) SHARED_EXT = dylib - SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT) + SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(LIBVER_MINOR).$(SHARED_EXT) SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT) - SONAME_FLAGS = -install_name $(PREFIX)/lib/liblz4.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER) +- SONAME_FLAGS = -install_name $(PREFIX)/lib/liblz4.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER) ++ SONAME_FLAGS = -install_name $(PREFIX)/lib/liblz4.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR).$(LIBVER_MINOR) -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) ++ SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR).$(LIBVER_MINOR) SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) + endif + From fb8c9d87843d121a7d8e011f6a4b3ae41a31504ea4c41f30c3c6ef7a30c2059b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Apr 2016 23:45:52 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=20 --- lz4-use-shlib.diff | 48 ++++++++++++++++++++++++++++++++++++++++------ lz4.spec | 10 ++++++---- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/lz4-use-shlib.diff b/lz4-use-shlib.diff index 6285818..fe5edb7 100644 --- a/lz4-use-shlib.diff +++ b/lz4-use-shlib.diff @@ -4,14 +4,23 @@ Date: 2014-10-01 14:23:22.000000000 +0200 build: make programs use liblz too instead of duplicating object code. --- - programs/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + programs/Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) Index: lz4-r131/programs/Makefile =================================================================== --- lz4-r131.orig/programs/Makefile +++ lz4-r131/programs/Makefile -@@ -72,11 +72,11 @@ bins: lz4 lz4c fullbench fuzzer frametes +@@ -40,7 +40,7 @@ DESTDIR?= + PREFIX ?= /usr/local + CFLAGS ?= -O3 + CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\" +-FLAGS := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) ++FLAGS := -DXXH_NAMESPACE=LZ4_ -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) + + BINDIR := $(PREFIX)/bin + MANDIR := $(PREFIX)/share/man/man1 +@@ -72,32 +72,32 @@ bins: lz4 lz4c fullbench fuzzer frametes all: bins m32 @@ -20,10 +29,37 @@ Index: lz4-r131/programs/Makefile +lz4: bench.c lz4io.c lz4cli.c + $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 --lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c + lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c - $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -+lz4c : bench.c lz4io.c lz4cli.c + $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4 lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c - $(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) +- $(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) ++ $(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + fullbench : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c fullbench.c +- $(CC) $(FLAGS) $^ -o $@$(EXT) ++ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + fullbench32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c fullbench.c +- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) ++ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + fuzzer : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c fuzzer.c +- $(CC) $(FLAGS) $^ -o $@$(EXT) ++ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + fuzzer32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c fuzzer.c +- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) ++ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + frametest: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c +- $(CC) $(FLAGS) $^ -o $@$(EXT) ++ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + frametest32: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c +- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) ++ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + datagen : datagen.c datagencli.c + $(CC) $(FLAGS) $^ -o $@$(EXT) diff --git a/lz4.spec b/lz4.spec index fc86476..9418c4d 100644 --- a/lz4.spec +++ b/lz4.spec @@ -75,14 +75,16 @@ applications that want to make use of liblz4. %build # Goddammit, lz4 perl -i -pe 's{^\t@}{\t}g' Makefile */Makefile - -make -C lib %{?_smp_mflags} CFLAGS="%optflags" -make -C programs %{?_smp_mflags} CFLAGS="%optflags" lz4 lz4c +# don't bother building here, because make install builds it again - unconditionally :-( %install -make install DESTDIR="%buildroot" PREFIX="%_prefix" LIBDIR="%_libdir" +make install CFLAGS="%optflags -DXXH_NAMESPACE=LZ4_" \ + DESTDIR="%buildroot" PREFIX="%_prefix" LIBDIR="%_libdir" rm -f "%buildroot/%_libdir"/*.a +%check +LD_LIBRARY_PATH="%buildroot/%_libdir" ldd -r "%buildroot/%_bindir/lz4" + %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig From 405a7fce34c91fc751060e98d42ab9b89d585a10809e90fcef7af97414f0bbe2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Apr 2016 23:56:32 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=21 --- lz4-soversion.diff | 1 + lz4-use-shlib.diff | 1 + 2 files changed, 2 insertions(+) diff --git a/lz4-soversion.diff b/lz4-soversion.diff index adbd20f..1d24c14 100644 --- a/lz4-soversion.diff +++ b/lz4-soversion.diff @@ -1,5 +1,6 @@ From: Jan Engelhardt Date: 2014-11-28 20:01:01.723860722 +0100 +References: https://github.com/Cyan4973/lz4/pull/195 lz4 repeatedly changed the ABI without updating the SONAME in r124 (size of LZ4_streamDecode_t changes) diff --git a/lz4-use-shlib.diff b/lz4-use-shlib.diff index fe5edb7..c7ec80b 100644 --- a/lz4-use-shlib.diff +++ b/lz4-use-shlib.diff @@ -1,5 +1,6 @@ From: Jan Engelhardt Date: 2014-10-01 14:23:22.000000000 +0200 +References: https://github.com/Cyan4973/lz4/pull/195 build: make programs use liblz too instead of duplicating object code. From 28d0a53f3212a2918d0d9c9484434e613dae2fd422d26b9c859fc83b79ad9fcd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sun, 3 Apr 2016 07:41:13 +0000 Subject: [PATCH 5/5] - Update to new upstream release 131 (library 1.7) (boo#973735) OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=22 --- lz4.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lz4.changes b/lz4.changes index f35e312..df9de7d 100644 --- a/lz4.changes +++ b/lz4.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sat Apr 2 19:26:32 UTC 2016 - jengelh@inai.de -- Update to new upstream release 131 (library 1.7) +- Update to new upstream release 131 (library 1.7) (boo#973735) * slightly improved decoding speed * lz4frame API is included in liblz4 * new -m command line option to compress multiple files