diff --git a/.gitignore b/.gitignore index 036e4ff..03fa5d7 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /lz4-7d182b816ace89d6d6d16b7aee376a9962a05caa.tar.gz /lz4-baf78e7e4dcbdf824a76f990ffeb573d113bbbdb.tar.gz /lz4-d86dc916771c126afb797637dda9f6421c0cb998.tar.gz +/lz4-1.7.3.tar.gz diff --git a/0001-Makefile-fix-DESTDIR.patch b/0001-Makefile-fix-DESTDIR.patch deleted file mode 100644 index fa5b53a..0000000 --- a/0001-Makefile-fix-DESTDIR.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2aabe3fd4cc36924db3b5e7b06d6adc7f9302bb7 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Fri, 8 Aug 2014 10:23:00 +0200 -Subject: [PATCH] Makefile: fix DESTDIR - -Signed-off-by: Igor Gnatenko ---- - Makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index b2b64e7..36e75c5 100644 ---- a/Makefile -+++ b/Makefile -@@ -38,11 +38,11 @@ LIBVER_MINOR=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).* - LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` - LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH) - --DESTDIR= --PREFIX = /usr --CC := $(CC) --CFLAGS?= -O3 --CFLAGS+= -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\" -+DESTDIR?= -+PREFIX ?= /usr -+CC := $(CC) -+CFLAGS ?= -O3 -+CFLAGS += -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\" - - LIBDIR?= $(PREFIX)/lib - INCLUDEDIR=$(PREFIX)/include --- -2.0.4 diff --git a/lz4.spec b/lz4.spec index f3dc55c..b035e30 100644 --- a/lz4.spec +++ b/lz4.spec @@ -1,19 +1,11 @@ -%global _hardened_build 1 -%global commit d86dc916771c126afb797637dda9f6421c0cb998 - Name: lz4 -Version: r131 -Release: 2%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Extremely fast compression algorithm -Group: Applications/System License: GPLv2+ and BSD -URL: https://code.google.com/p/lz4/ -Source0: https://github.com/Cyan4973/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz - -%if 0%{?rhel} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -%endif +URL: https://lz4.github.io/lz4/ +Source0: https://github.com/Cyan4973/lz4/archive/v%{version}/%{name}-%{version}.tar.gz %description LZ4 is an extremely fast loss-less compression algorithm, providing compression @@ -22,69 +14,63 @@ an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. %package devel -Summary: Development library for lz4 -Group: Development/Libraries -License: BSD +Summary: Development files for lz4 Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains the header(.h) and library(.so) files required to build applications using liblz4 library. - %package static Summary: Static library for lz4 -Group: Development/Libraries -License: BSD %description static LZ4 is an extremely fast loss-less compression algorithm. This package contains static libraries for static linking of applications. %prep -%setup -q -n %{name}-%{commit} +%autosetup echo '#!/bin/sh' > ./configure chmod +x ./configure %build %configure -make %{?_smp_mflags} - +%make_build %install %configure -%make_install LIBDIR=%{_libdir} PREFIX=/usr INSTALL="install -p" -chmod -x %{buildroot}%{_includedir}/*.h - +%make_install LIBDIR=%{_libdir} PREFIX=%{_prefix} INSTALL="install -p" %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -%doc programs/COPYING NEWS +%license programs/COPYING lib/LICENSE +%doc NEWS %{_bindir}/lz4 %{_bindir}/lz4c %{_bindir}/lz4cat %{_bindir}/unlz4 -%{_mandir}/man1/lz4* -%{_mandir}/man1/unlz4* -%{_libdir}/liblz4.so.1* - +%{_mandir}/man1/lz4.1* +%{_mandir}/man1/lz4c.1* +%{_mandir}/man1/lz4cat.1* +%{_mandir}/man1/unlz4.1* +%{_libdir}/liblz4.so.* %files devel %doc lib/LICENSE -%{_includedir}/*.h +%{_includedir}/lz4*.h %{_libdir}/liblz4.so %{_libdir}/pkgconfig/liblz4.pc - %files static %doc lib/LICENSE %{_libdir}/liblz4.a - %changelog +* Sat Nov 19 2016 Igor Gnatenko - 1.7.3-1 +- Update to 1.7.3 (RHBZ #1395458) + * Thu Feb 04 2016 Fedora Release Engineering - r131-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 4fa9a4c..077aa6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ee49488ab052fed6aa3fd85e21c0f16 lz4-d86dc916771c126afb797637dda9f6421c0cb998.tar.gz +7e94b203f8c85e600c430017a9ef8b3d lz4-1.7.3.tar.gz