From cd2a8694e9bf336cb06528ebd634fb9cca7cd69ae84448500ab0df29a2fd3d3d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 16 Jul 2014 14:37:16 +0000 Subject: [PATCH] lz4-1.2.0.r119 OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=9 --- lz4-automake.diff | 55 ----------------------------------------------- lz4-killdate.diff | 52 ++++++++++++++++++++++---------------------- lz4-svn108.tar.xz | 3 --- lz4-svn119.tar.lz | 3 +++ lz4.changes | 8 +++++++ lz4.spec | 31 +++++++++++++------------- 6 files changed, 52 insertions(+), 100 deletions(-) delete mode 100644 lz4-automake.diff delete mode 100644 lz4-svn108.tar.xz create mode 100644 lz4-svn119.tar.lz diff --git a/lz4-automake.diff b/lz4-automake.diff deleted file mode 100644 index f5c51a7..0000000 --- a/lz4-automake.diff +++ /dev/null @@ -1,55 +0,0 @@ -From: Jan Engelhardt -Date: 2013-09-03 18:36:01.337662518 +0200 - -build: add automake files - -cmake is nice, but the lz4c32/lz4c64 distinction is totally uncool -for distros. The many options also make CMakeLists.txt longer than -it needs to be. - ---- - Makefile.am | 19 +++++++++++++++++++ - configure.ac | 10 ++++++++++ - 2 files changed, 29 insertions(+) - -Index: trunk/Makefile.am -=================================================================== ---- /dev/null -+++ trunk/Makefile.am -@@ -0,0 +1,21 @@ -+# -*- Makefile -*- -+ -+AM_CFLAGS = -Wall -W -Wundef -Wcast-align -Wno-implicit-function-declaration \ -+ -Os -std=c99 -+ -+lib_LTLIBRARIES = liblz4.la -+liblz4_la_SOURCES = lz4.c lz4hc.c -+liblz4_la_LDFLAGS = -release 0s108 -+ -+include_HEADERS = lz4.h lz4hc.h -+ -+bin_PROGRAMS = lz4c -+lz4c_SOURCES = xxhash.c bench.c lz4cli.c -+lz4c_LDADD = liblz4.la -+ -+noinst_PROGRAMS = fuzzer fullbench -+fuzzer_LDADD = liblz4.la -+fullbench_SOURCES = fullbench.c xxhash.c -+fullbench_LDADD = liblz4.la -+ -+man1_MANS = lz4.1 -Index: trunk/configure.ac -=================================================================== ---- /dev/null -+++ trunk/configure.ac -@@ -0,0 +1,10 @@ -+AC_INIT([lz4], [0]) -+AC_CONFIG_AUX_DIR([build-aux]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax dist-xz]) -+AC_PROG_CC -+AM_PROG_CC_C_O -+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -+LT_INIT([disable-static]) -+AC_CONFIG_FILES([Makefile]) -+AC_OUTPUT diff --git a/lz4-killdate.diff b/lz4-killdate.diff index b34b0b8..5470188 100644 --- a/lz4-killdate.diff +++ b/lz4-killdate.diff @@ -1,31 +1,31 @@ --- - fullbench.c | 2 +- - lz4c.c | 2 +- + programs/fullbench.c | 2 +- + programs/lz4cli.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: trunk/fullbench.c +Index: trunk/programs/fullbench.c =================================================================== ---- trunk.orig/fullbench.c -+++ trunk/fullbench.c -@@ -105,7 +105,7 @@ - //**************************** - #define COMPRESSOR_NAME "LZ4 speed analyzer" - #define COMPRESSOR_VERSION "" --#define COMPILED __DATE__ -+#define COMPILED "SUSE" - #define AUTHOR "Yann Collet" - #define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", COMPRESSOR_NAME, COMPRESSOR_VERSION, (int)(sizeof(void*)*8), AUTHOR, COMPILED - -Index: trunk/lz4cli.c +--- trunk.orig/programs/fullbench.c ++++ trunk/programs/fullbench.c +@@ -109,7 +109,7 @@ + # define LZ4_VERSION "" + #endif + #define AUTHOR "Yann Collet" +-#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", PROGRAM_DESCRIPTION, LZ4_VERSION, (int)(sizeof(void*)*8), AUTHOR, __DATE__ ++#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", PROGRAM_DESCRIPTION, LZ4_VERSION, (int)(sizeof(void*)*8), AUTHOR, "SUSE" + + #define NBLOOPS 6 + #define TIMELOOP 2500 +Index: trunk/programs/lz4cli.c =================================================================== ---- trunk.orig/lz4cli.c -+++ trunk/lz4cli.c -@@ -108,7 +108,7 @@ - //**************************** - #define COMPRESSOR_NAME "LZ4 Compression CLI" - #define COMPRESSOR_VERSION "v1.0.8" --#define COMPILED __DATE__ -+#define COMPILED "SUSE" - #define AUTHOR "Yann Collet" - #define LZ4_EXTENSION ".lz4" - #define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), COMPRESSOR_VERSION, AUTHOR, COMPILED +--- trunk.orig/programs/lz4cli.c ++++ trunk/programs/lz4cli.c +@@ -112,7 +112,7 @@ + # define LZ4_VERSION "v1.2.0" + #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" + diff --git a/lz4-svn108.tar.xz b/lz4-svn108.tar.xz deleted file mode 100644 index a74ac03..0000000 --- a/lz4-svn108.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:849ba02a6cf1e90565923fa1a01089cb53e876cb43181fd30eebee8134005cd6 -size 140920 diff --git a/lz4-svn119.tar.lz b/lz4-svn119.tar.lz new file mode 100644 index 0000000..e056093 --- /dev/null +++ b/lz4-svn119.tar.lz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96019c37ebf5546b5644eca7e79f5111aa784d877726641f3294147d04052fe9 +size 141631 diff --git a/lz4.changes b/lz4.changes index 7393298..8f92c3e 100644 --- a/lz4.changes +++ b/lz4.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jul 16 14:34:44 UTC 2014 - jengelh@inai.de + +- Update to svn revision 119, set version to 1.2.0 (based upon + Makefile contents; it's still odd to see the 1.4 Windows release) +* Provide LZ4 as a shared library +- Remove lz4-automake.diff (no longer deemed necessary) + ------------------------------------------------------------------- Mon Nov 25 23:07:48 UTC 2013 - dsterba@suse.com diff --git a/lz4.spec b/lz4.spec index 76cd858..297ce10 100644 --- a/lz4.spec +++ b/lz4.spec @@ -1,7 +1,7 @@ # # spec file for package lz4 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,8 +17,8 @@ Name: lz4 -%define lname liblz4-0s108 -Version: 1.4+svn108 +%define lname liblz4-1 +Version: 1.2.0.r119 Release: 0 Summary: Hash-based Predictive Lempel-Ziv compressor License: GPL-2.0+ and BSD-2-Clause @@ -28,14 +28,13 @@ Url: http://code.google.com/p/lz4/ #SVN-Clone: http://lz4.googlecode.com/svn/trunk # Project offers no source tarballs. -Source: %name-svn108.tar.xz -Patch1: lz4-automake.diff +Source: %name-svn119.tar.lz Patch2: lz4-killdate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool >= 2 -BuildRequires: xz +BuildRequires: lzip %description LZ4 is a very fast compressor, based on well-known LZ77 (Lempel-Ziv) @@ -73,26 +72,26 @@ applications that want to make use of liblz4. %prep %setup -qn trunk -%patch -P 1 -P 2 -p1 +%patch -P 2 -p1 %build -autoreconf -fi; -%configure -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="%optflags" %install -make install DESTDIR="%buildroot" -rm -f "%buildroot/%_libdir"/*.la -rm -f "%_bindir"/lz4 +make install DESTDIR="%buildroot" LIBDIR="%_libdir" +rm -f "%buildroot/%_libdir"/*.a + +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) -%_bindir/lz4c -%_mandir/man1/lz4.1* +%_bindir/lz4* +%_mandir/man1/*.1* %files -n %lname %defattr(-,root,root) -%_libdir/liblz4-*.so +%_libdir/liblz4.so.1* %files -n liblz4-devel %defattr(-,root,root)