[lz4/f19] Update to lz4-r118

[pjp]

commit 5689cfa7a400115ffd97b2ac099ab2551c861fec
Author: P J P <pjp at fedoraproject.org>
Date:   Wed Jul 2 23:03:14 2014 +0530

    Update to lz4-r118

 .gitignore |    1 +
 lz4.spec   |   34 ++++++++++++++++++++--------------
 sources    |    2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c44fcb..84c7f1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /lz4-r110.tar.gz
 /lz4-r116.tar.gz
 /lz4-r117.tar.gz
+/lz4-r118.tar.gz
diff --git a/lz4.spec b/lz4.spec
index 5fc0db2..b3c3aef 100644
--- a/lz4.spec
+++ b/lz4.spec
@@ -1,15 +1,18 @@
 %global _hardened_build 1
 
 Name:           lz4
-Version:        r117
-Release:        3%{?dist}
+Version:        r118
+Release:        1%{?dist}
 Summary:        Extremely fast compression algorithm
 
 Group:          Applications/System
-License:        GPLv2
+License:        GPLv2+ and BSD
 URL:            https://code.google.com/p/lz4/
 Source0:        https://github.com/Cyan4973/lz4/archive/%{version}/%{name}-%{version}.tar.gz
+
+%if 0%{?rhel}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%endif
 
 %description
 LZ4 is an extremely fast loss-less compression algorithm, providing compression
@@ -21,7 +24,7 @@ reaching RAM speed limits on multi-core systems.
 Summary:        Development library for lz4
 Group:          Development/Libraries
 License:        BSD
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
 This package contains the header(.h) and library(.so) files required to build
@@ -37,41 +40,44 @@ make %{?_smp_mflags}
 
 
 %install
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix} INSTALL="install -p"
+make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+    LIBDIR=$RPM_BUILD_ROOT%{_libdir} INSTALL="install -p"
 chmod -x $RPM_BUILD_ROOT%{_includedir}/*.h
-rm $RPM_BUILD_ROOT%{_usr}/lib/liblz4.a
+rm $RPM_BUILD_ROOT%{_libdir}/liblz4.a
 
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
-%post devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
-
-
 %files
 %doc programs/COPYING NEWS
 %{_bindir}/lz4
 %{_bindir}/lz4c
 %{_bindir}/lz4cat
 %{_mandir}/man1/lz4*
-%{_usr}/lib/liblz4.so.1*
+%{_libdir}/liblz4.so.1*
 
 
 %files devel
-%defattr (-, root, root, -)
-%doc LICENSE NEWS
+%doc LICENSE
 %{_includedir}/*.h
-%{_usr}/lib/liblz4.so
+%{_libdir}/liblz4.so
 
 %changelog
+* Sat Jun 28 2014 pjp <pjp at fedoraproject.org> - r118-1
+- new release
+- install libraries under appropriate _libdir directories.
+
 * Sat Jun 14 2014 pjp <pjp at fedoraproject.org> - r117-3
 - Move shared library object to -devel package.
 
 * Sat Jun 07 2014 pjp <pjp at fedoraproject.org> - r117-2
 - Skip static library from installation.
 
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - r117-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Fri Jun 06 2014 pjp <pjp at fedoraproject.org> - r117-1
 - new release
 - added lz4c & lz4cat manual pages.
diff --git a/sources b/sources
index c7e0ba6..f41fa66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-162b87ff689e1261b7e6d58c36c4bb5f  lz4-r117.tar.gz
+7b155d93c6e5d48494f8bfd32f831440  lz4-r118.tar.gz