diff --git a/lz4-automake.diff b/lz4-automake.diff index 0b0bb67..e166e3a 100644 --- a/lz4-automake.diff +++ b/lz4-automake.diff @@ -1,29 +1,53 @@ ---- - Makefile.am | 6 ++++++ - configure.ac | 8 ++++++++ - 2 files changed, 14 insertions(+) +From: Jan Engelhardt +Date: 2013-09-03 18:36:01.337662518 +0200 -Index: lz4/Makefile.am +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 -+++ lz4/Makefile.am -@@ -0,0 +1,6 @@ ++++ trunk/Makefile.am +@@ -0,0 +1,19 @@ +# -*- Makefile -*- + -+AM_CFLAGS = -Wall -std=c99 ++AM_CFLAGS = -Wall -W -Wundef -Wcast-align -Wno-implicit-function-declaration \ ++ -Os -std=c99 + -+bin_PROGRAMS = lz4 -+lz4_SOURCES = lz4.c lz4.h lz4hc.c lz4hc.h bench.c lz4demo.c -Index: lz4/configure.ac ++lib_LTLIBRARIES = liblz4.la ++liblz4_la_SOURCES = lz4.c lz4hc.c ++liblz4_la_LDFLAGS = -release 0s102 ++ ++include_HEADERS = lz4.h lz4hc.h ++ ++bin_PROGRAMS = lz4c ++lz4c_SOURCES = xxhash.c bench.c lz4c.c ++lz4c_LDADD = liblz4.la ++ ++noinst_PROGRAMS = fuzzer fullbench ++fuzzer_LDADD = liblz4.la ++fullbench_SOURCES = fullbench.c xxhash.c ++fullbench_LDADD = liblz4.la +Index: trunk/configure.ac =================================================================== --- /dev/null -+++ lz4/configure.ac -@@ -0,0 +1,8 @@ ++++ 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]) ++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 new file mode 100644 index 0000000..f661774 --- /dev/null +++ b/lz4-killdate.diff @@ -0,0 +1,31 @@ +--- + fullbench.c | 2 +- + lz4c.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: trunk/fullbench.c +=================================================================== +--- trunk.orig/fullbench.c ++++ trunk/fullbench.c +@@ -105,7 +105,7 @@ + //**************************** + #define COMPRESSOR_NAME "Full LZ4 speed analyzer" + #define COMPRESSOR_VERSION "" +-#define COMPILED __DATE__ ++#define COMPILED "SUSE" + #define AUTHOR "Yann Collet" + #define WELCOME_MESSAGE "*** %s %s, by %s (%s) ***\n", COMPRESSOR_NAME, COMPRESSOR_VERSION, AUTHOR, COMPILED + +Index: trunk/lz4c.c +=================================================================== +--- trunk.orig/lz4c.c ++++ trunk/lz4c.c +@@ -85,7 +85,7 @@ + //**************************** + #define COMPRESSOR_NAME "LZ4 Compression CLI" + #define COMPRESSOR_VERSION "" +-#define COMPILED __DATE__ ++#define COMPILED "SUSE" + #define AUTHOR "Yann Collet" + #define EXTENSION ".lz4" + #define WELCOME_MESSAGE "*** %s %s, by %s (%s) ***\n", COMPRESSOR_NAME, COMPRESSOR_VERSION, AUTHOR, COMPILED diff --git a/lz4-svn102.tar.xz b/lz4-svn102.tar.xz new file mode 100644 index 0000000..ccd8328 --- /dev/null +++ b/lz4-svn102.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4ca723da9ee4ea1cb5ab1bf9b2ac11ffe15c62ef5a85ec5f90d5866921fb715 +size 121264 diff --git a/lz4-svn77.tar.xz b/lz4-svn77.tar.xz deleted file mode 100644 index 4b65ef6..0000000 --- a/lz4-svn77.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce5377a0f42a3881eae447cc8ae1638e4b152f2b4dc6a55494a8fcfb08907e10 -size 18360 diff --git a/lz4.changes b/lz4.changes index 6ee279e..1539f5d 100644 --- a/lz4.changes +++ b/lz4.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 3 16:48:31 UTC 2013 - jengelh@inai.de + +- Update to new snapshot svn102; set version as 1.3.3 in accordance + with latest Windows releases. +* Add lz4-killdate.diff (kill the ungodly __DATE__s) + ------------------------------------------------------------------- Thu Feb 21 05:52:43 UTC 2013 - jengelh@inai.de diff --git a/lz4.spec b/lz4.spec index af8ec94..2d697f4 100644 --- a/lz4.spec +++ b/lz4.spec @@ -1,7 +1,7 @@ # # spec file for package lz4 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -14,30 +14,65 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: lz4 -Version: 1.2d+77 +%define lname liblz4-0s102 +Version: 1.3.3+svn102 Release: 0 -Summary: Hash-based Predictive LZ compressor +Summary: Hash-based Predictive Lempel-Ziv compressor +License: GPL-2.0+ and BSD-2-Clause Group: Productivity/Archiving/Compression -License: BSD-2-Clause -URL: http://code.google.com/p/lz4/ +Url: http://code.google.com/p/lz4/ #URL: http://fastcompression.blogspot.com/p/lz4.html #SVN-Clone: http://lz4.googlecode.com/svn/trunk # Project offers no source tarballs. -Source: lz4-svn77.tar.xz +Source: %name-svn102.tar.xz Patch1: lz4-automake.diff +Patch2: lz4-killdate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf, automake, xz +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool >= 2 +BuildRequires: xz %description LZ4 is a very fast compressor, based on well-known LZ77 (Lempel-Ziv) -algorithm. Originally a fork from LZP2, it provides better -compression ratio for text files. +algorithm. 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. + +%package -n %lname +Summary: Hash-based predictive Lempel-Ziv compressor +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. + +This subpackage contains the (de)compressor code as a shared library. + +%package devel +Summary: Development files for the LZ4 compressor +License: BSD-2-Clause +Group: Development/Libraries/C and C++ + +%description 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. + +This subpackage contains libraries and header files for developing +applications that want to make use of liblz4. %prep -%setup -qn %name -%patch -P 1 -p1 +%setup -qn trunk +%patch -P 1 -P 2 -p1 %build autoreconf -fi; @@ -46,9 +81,19 @@ make %{?_smp_mflags} %install make install DESTDIR="%buildroot" +rm -f "%buildroot/%_libdir"/*.la %files %defattr(-,root,root) -%_bindir/lz4 +%_bindir/lz4c + +%files -n %lname +%defattr(-,root,root) +%_libdir/liblz4-*.so + +%files devel +%defattr(-,root,root) +%_includedir/lz4*.h +%_libdir/liblz4.so %changelog