From f83d33ef60a78330a77e2072fe65fe7bb5424e68 Mon Sep 17 00:00:00 2001
From: Huzaifa Sidhpurwala <huzaifas@redhat.com>
Date: Sep 14 2011 07:12:15 +0000
Subject: Update to lzo-2.06


---

diff --git a/.gitignore b/.gitignore
index 2c81304..5153ac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 lzo-2.03.tar.gz
+/lzo-2.06.tar.gz
diff --git a/lzo-2.06-configure.patch b/lzo-2.06-configure.patch
new file mode 100644
index 0000000..44ae20d
--- /dev/null
+++ b/lzo-2.06-configure.patch
@@ -0,0 +1,24 @@
+diff -Naur lzo-2.06/configure lzo-2.06.configure/configure
+--- lzo-2.06/configure	2011-08-12 21:32:59.000000000 +0530
++++ lzo-2.06.configure/configure	2011-09-14 12:33:41.151087816 +0530
+@@ -12964,7 +12964,7 @@
+ asm_msg_amd64=no
+ asm_msg_i386=no
+ 
+-case "$host_cpu-$ac_cv_sizeof_void_p" in
++case "$target_cpu-$ac_cv_sizeof_void_p" in
+     amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;;
+     i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;;
+     *) enable_asm=no ;;
+diff -Naur lzo-2.06/configure.ac lzo-2.06.configure/configure.ac
+--- lzo-2.06/configure.ac	2011-08-12 21:32:59.000000000 +0530
++++ lzo-2.06.configure/configure.ac	2011-09-14 12:33:31.851087334 +0530
+@@ -123,7 +123,7 @@
+ asm_msg_amd64=no
+ asm_msg_i386=no
+ 
+-case "$host_cpu-$ac_cv_sizeof_void_p" in
++case "$target_cpu-$ac_cv_sizeof_void_p" in
+     amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;;
+     i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;;
+     *) enable_asm=no ;;
diff --git a/lzo.spec b/lzo.spec
index f33e6a9..34648e7 100644
--- a/lzo.spec
+++ b/lzo.spec
@@ -1,12 +1,12 @@
 Name:           lzo
-Version:        2.03
-Release:        4%{?dist}
+Version:        2.06
+Release:        1%{?dist}
 Summary:        Data compression library with very fast (de)compression
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.oberhumer.com/opensource/lzo/
 Source0:        http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
-Patch0:         lzo-2.02-configure.patch
+Patch0:         lzo-2.06-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel
 
@@ -59,12 +59,14 @@ gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/liblzo2.la
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 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
 
+#Remove doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/lzo
 
 %check
 make check test
@@ -101,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 14 2011 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 2.06-1
+- Upgrade to latest upstream
+- Apply patch from Nicolas Chauvet
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index f176916..431bcbc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c3d078c2e8ea5a88971089a2f02a726  lzo-2.03.tar.gz
+95380bd4081f85ef08c5209f4107e9f8  lzo-2.06.tar.gz