commit 6dd51171aa755106bd6dd99322f0112c04866dc5
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Mon Dec 12 11:12:09 2016 +0200
up to 1.7.4.2
lz4-nom32.patch | 11 -----------
lz4.spec | 20 ++++++++------------
2 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/lz4.spec b/lz4.spec
index 7d86ee4..d285284 100644
--- a/lz4.spec
+++ b/lz4.spec
@@ -1,13 +1,12 @@
Summary: Hash-based Predictive Lempel-Ziv compressor
Summary(pl.UTF-8): Kompresor wykorzystujący metodę Lempel-Ziv z predykcją
opartą na haszach
Name: lz4
-Version: r131
-Release: 5
+Version: 1.7.4.2
+Release: 1
License: BSD (library), GPL v2+ (CLI utility)
Group: Applications
-Source0:
https://github.com/Cyan4973/lz4/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 42b09fab42331da9d3fb33bd5c560de9
-Patch0: %{name}-nom32.patch
+Source0:
https://github.com/lz4/lz4/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: c8a1e198555fb0650448e498b7614ae5
URL: http://www.lz4.org/
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -73,24 +72,21 @@ Statyczna biblioteka kompresora LZ4.
%prep
%setup -q
-%patch0 -p1
%build
-CFLAGS="%{rpmcflags}" \
-%{__make} lib all \
- CC="%{__cc}" \
- CPPFLAGS="%{rpmcppflags}"
+%{__make} -j1 \
+ MOREFLAGS="%{rpmcflags} %{rpmcppflags}" \
+ CC="%{__cc}"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{_lib}
-
%{__make} install \
PREFIX=%{_prefix} \
LIBDIR=%{_libdir} \
INSTALL="install -p" \
DESTDIR=$RPM_BUILD_ROOT \
+install -d $RPM_BUILD_ROOT/%{_lib}
mv $RPM_BUILD_ROOT%{_libdir}/liblz4.so.* $RPM_BUILD_ROOT/%{_lib}
ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo liblz4.so.*.*.*) \
$RPM_BUILD_ROOT%{_libdir}/liblz4.so
diff --git a/lz4-nom32.patch b/lz4-nom32.patch
deleted file mode 100644
index 72b3b21..0000000
--- a/lz4-nom32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lz4-r131/programs/Makefile.orig 2015-06-29 11:48:37.000000000 +0200
-+++ lz4-r131/programs/Makefile 2016-11-06 09:13:53.897631799 +0100
-@@ -70,7 +70,7 @@
-
- bins: lz4 lz4c fullbench fuzzer frametest datagen
-
--all: bins m32
-+all: bins
-
- lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c
$(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lz4.git/commitdiff/6dd51171aa755106bd6dd99322f0112c04866dc5
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
