From 8b4deb0d222e15bdc2fd1db064488937b50cb9f03382e2abb686fa29e1453de7 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 26 Nov 2013 04:03:34 +0000
Subject: [PATCH] Accepting request 208363 from home:dsterba:branches:Archiving

- update to svn 108, set version to 1.4 (current windows release)
  - added manpage
  - minor code updates

OBS-URL: https://build.opensuse.org/request/show/208363
OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=7
---
 lz4-automake.diff |  8 +++++---
 lz4-killdate.diff | 18 +++++++++---------
 lz4-svn102.tar.xz |  3 ---
 lz4-svn108.tar.xz |  3 +++
 lz4.changes       |  7 +++++++
 lz4.spec          |  8 +++++---
 6 files changed, 29 insertions(+), 18 deletions(-)
 delete mode 100644 lz4-svn102.tar.xz
 create mode 100644 lz4-svn108.tar.xz

diff --git a/lz4-automake.diff b/lz4-automake.diff
index e166e3a..f5c51a7 100644
--- a/lz4-automake.diff
+++ b/lz4-automake.diff
@@ -16,7 +16,7 @@ Index: trunk/Makefile.am
 ===================================================================
 --- /dev/null
 +++ trunk/Makefile.am
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,21 @@
 +# -*- Makefile -*-
 +
 +AM_CFLAGS = -Wall -W -Wundef -Wcast-align -Wno-implicit-function-declaration \
@@ -24,18 +24,20 @@ Index: trunk/Makefile.am
 +
 +lib_LTLIBRARIES = liblz4.la
 +liblz4_la_SOURCES = lz4.c lz4hc.c
-+liblz4_la_LDFLAGS = -release 0s102
++liblz4_la_LDFLAGS = -release 0s108
 +
 +include_HEADERS = lz4.h lz4hc.h
 +
 +bin_PROGRAMS = lz4c
-+lz4c_SOURCES = xxhash.c bench.c lz4c.c
++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
diff --git a/lz4-killdate.diff b/lz4-killdate.diff
index f661774..b34b0b8 100644
--- a/lz4-killdate.diff
+++ b/lz4-killdate.diff
@@ -9,23 +9,23 @@ Index: trunk/fullbench.c
 +++ trunk/fullbench.c
 @@ -105,7 +105,7 @@
  //****************************
- #define COMPRESSOR_NAME "Full LZ4 speed analyzer"
+ #define COMPRESSOR_NAME "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
+ #define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", COMPRESSOR_NAME, COMPRESSOR_VERSION, (int)(sizeof(void*)*8), AUTHOR, COMPILED
  
-Index: trunk/lz4c.c
+Index: trunk/lz4cli.c
 ===================================================================
---- trunk.orig/lz4c.c
-+++ trunk/lz4c.c
-@@ -85,7 +85,7 @@
+--- trunk.orig/lz4cli.c
++++ trunk/lz4cli.c
+@@ -108,7 +108,7 @@
  //****************************
  #define COMPRESSOR_NAME "LZ4 Compression CLI"
- #define COMPRESSOR_VERSION ""
+ #define COMPRESSOR_VERSION "v1.0.8"
 -#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
+ #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
diff --git a/lz4-svn102.tar.xz b/lz4-svn102.tar.xz
deleted file mode 100644
index ccd8328..0000000
--- a/lz4-svn102.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4ca723da9ee4ea1cb5ab1bf9b2ac11ffe15c62ef5a85ec5f90d5866921fb715
-size 121264
diff --git a/lz4-svn108.tar.xz b/lz4-svn108.tar.xz
new file mode 100644
index 0000000..a74ac03
--- /dev/null
+++ b/lz4-svn108.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:849ba02a6cf1e90565923fa1a01089cb53e876cb43181fd30eebee8134005cd6
+size 140920
diff --git a/lz4.changes b/lz4.changes
index 1539f5d..7393298 100644
--- a/lz4.changes
+++ b/lz4.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 25 23:07:48 UTC 2013 - dsterba@suse.com
+
+- update to svn 108, set version to 1.4 (current windows release)
+  - added manpage
+  - minor code updates
+
 -------------------------------------------------------------------
 Tue Sep  3 16:48:31 UTC 2013 - jengelh@inai.de
 
diff --git a/lz4.spec b/lz4.spec
index dcd5c56..76cd858 100644
--- a/lz4.spec
+++ b/lz4.spec
@@ -17,8 +17,8 @@
 
 
 Name:           lz4
-%define lname	liblz4-0s102
-Version:        1.3.3+svn102
+%define lname	liblz4-0s108
+Version:        1.4+svn108
 Release:        0
 Summary:        Hash-based Predictive Lempel-Ziv compressor
 License:        GPL-2.0+ and BSD-2-Clause
@@ -28,7 +28,7 @@ Url:            http://code.google.com/p/lz4/
 
 #SVN-Clone:	http://lz4.googlecode.com/svn/trunk
 # Project offers no source tarballs.
-Source:         %name-svn102.tar.xz
+Source:         %name-svn108.tar.xz
 Patch1:         lz4-automake.diff
 Patch2:         lz4-killdate.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -83,10 +83,12 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR="%buildroot"
 rm -f "%buildroot/%_libdir"/*.la
+rm -f "%_bindir"/lz4
 
 %files
 %defattr(-,root,root)
 %_bindir/lz4c
+%_mandir/man1/lz4.1*
 
 %files -n %lname
 %defattr(-,root,root)