From 5d4f0b442ab471af3cad14d745d307249d02aac11d108ffb4006999faf3b90f2 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 31 Jul 2018 07:11:04 +0000
Subject: [PATCH] Accepting request 626645 from
 home:pluskalm:branches:Base:System

- Modernise spec file with spec-cleaner
- Move license to subpackage that will allways be installed

OBS-URL: https://build.opensuse.org/request/show/626645
OBS-URL: https://build.opensuse.org/package/show/Base:System/lzo?expand=0&rev=34
---
 lzo.changes |  6 ++++++
 lzo.spec    | 38 ++++++++++----------------------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/lzo.changes b/lzo.changes
index 6d3a07c..2555637 100644
--- a/lzo.changes
+++ b/lzo.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 31 06:51:14 UTC 2018 - mpluskal@suse.com
+
+- Modernise spec file with spec-cleaner
+- Move license to subpackage that will allways be installed
+
 -------------------------------------------------------------------
 Tue Nov 14 15:17:27 UTC 2017 - dimstar@opensuse.org
 
diff --git a/lzo.spec b/lzo.spec
index d50d261..5d2c2f3 100644
--- a/lzo.spec
+++ b/lzo.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lzo
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,18 @@
 #
 
 
+%define library_package liblzo2-2
 Name:           lzo
 Version:        2.10
 Release:        0
 Summary:        A Real-Time Data Compression Library
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Url:            http://www.oberhumer.com/opensource/lzo/
+URL:            http://www.oberhumer.com/opensource/lzo/
 Source:         http://www.oberhumer.com/opensource/%{name}/download/%{name}-%{version}.tar.gz
 Source2:        baselibs.conf
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# bug437293
-%ifarch ppc64
-Obsoletes:      lzo-64bit
-%endif
 
 %description
 LZO is a portable lossless data compression library written in ANSI C.
@@ -40,20 +36,13 @@ Decompression requires no memory. LZO is suitable for data compression
 and decompression in real-time. This means it favors speed over
 compression ratio.
 
-%define library_package liblzo2-2
-
-%package -n liblzo2-2
+%package -n %{library_package}
 Summary:        A Real-Time Data Compression Library
 Group:          Development/Libraries/C and C++
 Provides:       lzo = %{version}-%{release}
 Obsoletes:      lzo < %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      lzo-64bit
-%endif
-#
 
-%description -n liblzo2-2
+%description -n %{library_package}
 LZO is a portable lossless data compression library written in ANSI C.
 It offers pretty fast compression and very fast decompression.
 Decompression requires no memory. LZO is suitable for data compression
@@ -64,11 +53,6 @@ compression ratio.
 Summary:        Development files for lzo
 Group:          Development/Languages/C and C++
 Requires:       %{library_package} = %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      lzo-devel-64bit
-%endif
-#
 
 %description devel
 LZO is a portable lossless data compression library written in ANSI C.
@@ -114,27 +98,25 @@ make %{?_smp_mflags}
 make %{?_smp_mflags} check test
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 rm -v %{buildroot}%{_libdir}/liblzo2.la
+rm -v %{buildroot}%{_docdir}/%{name}-devel/COPYING
 
 %post   -n %{library_package} -p /sbin/ldconfig
-
 %postun -n %{library_package} -p /sbin/ldconfig
 
 %files -n %{library_package}
-%defattr(-,root,root)
+%license COPYING
 %{_libdir}/liblzo2.so.*
 
 %files devel
-%defattr (-,root,root)
-%doc AUTHORS BUGS COPYING NEWS README THANKS
+%doc AUTHORS BUGS NEWS README THANKS
 %doc doc/* util/*
 %{_libdir}/liblzo2.so
 %{_includedir}/lzo
 %{_libdir}/pkgconfig/lzo2.pc
 
 %files devel-static
-%defattr (-,root,root)
 %{_libdir}/liblzo2.a
 
 %changelog