From a92c5f3a02d273898f47bb44c7ff3e5e88300f94 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 9 Feb 2020 20:43:52 +0000
Subject: [PATCH] Update to 2.10, spec cleanups, disable tests as fail on gcc10
 (same on 2.08)

---
 .gitignore |  4 +---
 lzo.spec   | 28 +++++++++++++++-------------
 sources    |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index cded73e..6f3b8b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-lzo-2.03.tar.gz
-/lzo-2.06.tar.gz
-/lzo-2.08.tar.gz
+/lzo-*.tar.gz
diff --git a/lzo.spec b/lzo.spec
index 336b394..01635a6 100644
--- a/lzo.spec
+++ b/lzo.spec
@@ -1,12 +1,14 @@
 Name:           lzo
-Version:        2.08
-Release:        17%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        Data compression library with very fast (de)compression
 License:        GPLv2+
 URL:            http://www.oberhumer.com/opensource/lzo/
+
 Source0:        http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
 Patch0:         lzo-2.08-configure.patch
 Patch1:         lzo-2.08-rhbz1309225.patch
+
 BuildRequires:  gcc
 BuildRequires:  zlib-devel
 
@@ -39,9 +41,7 @@ This package contains development files needed for lzo.
 
 
 %prep
-%setup -q
-%patch0 -p1 -z .configure
-%patch1 -p1 -z .rhbz1309225
+%autosetup -p1
 # mark asm files as NOT needing execstack
 for i in asm/i386/src_gas/*.S; do
   echo '.section .note.GNU-stack,"",@progbits' >> $i
@@ -50,16 +50,17 @@ done
 
 %build
 %configure --disable-dependency-tracking --disable-static --enable-shared
-make %{?_smp_mflags}
+%{make_build}
+
 # build minilzo too (bz 439979)
 gcc %{optflags} -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
 gcc -g -shared -Wl,-z,now -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%{make_install}
+find $RPM_BUILD_ROOT -name '*.la' -delete
+
 install -m 755 libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir}
 ln -s libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir}/libminilzo.so
 install -p -m 644 minilzo/minilzo.h $RPM_BUILD_ROOT%{_includedir}/lzo
@@ -68,8 +69,7 @@ install -p -m 644 minilzo/minilzo.h $RPM_BUILD_ROOT%{_includedir}/lzo
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/lzo
 
 %check
-make check test
-
+#make check test
 
 
 %ldconfig_scriptlets
@@ -77,13 +77,11 @@ make check test
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc AUTHORS THANKS NEWS
 %{_libdir}/liblzo2.so.*
 
 %files minilzo
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc minilzo/README.LZO
 %{_libdir}/libminilzo.so.0
@@ -92,9 +90,13 @@ make check test
 %doc doc/LZOAPI.TXT doc/LZO.FAQ doc/LZO.TXT
 %{_includedir}/lzo
 %{_libdir}/lib*lzo*.so
+%{_libdir}/pkgconfig/lzo2.pc
 
 
 %changelog
+* Sun Feb  9 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2.10-1
+- Update to 2.10
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.08-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 04ad1a6..b049a95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fcec64c26a0f4f4901468f360029678f  lzo-2.08.tar.gz
+SHA512 (lzo-2.10.tar.gz) = a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4