From 9bb421de50a60f96bc85b5119a89734ae03e774e82652ebfcbe2489eff30883e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 25 Feb 2015 08:08:15 +0000 Subject: [PATCH] Accepting request 287603 from home:pluskalm:branches:Base:System - Cleanup spec file with spec-cleaner - Update to 2.09 * Work around gcc bug #64516 that could affect architectures like armv4, armv5 and sparc. OBS-URL: https://build.opensuse.org/request/show/287603 OBS-URL: https://build.opensuse.org/package/show/Base:System/lzo?expand=0&rev=28 --- lzo-2.08.tar.gz | 3 --- lzo-2.09.tar.gz | 3 +++ lzo.changes | 8 +++++++ lzo.spec | 60 +++++++++++++------------------------------------ 4 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 lzo-2.08.tar.gz create mode 100644 lzo-2.09.tar.gz diff --git a/lzo-2.08.tar.gz b/lzo-2.08.tar.gz deleted file mode 100644 index 94aee02..0000000 --- a/lzo-2.08.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614 -size 589045 diff --git a/lzo-2.09.tar.gz b/lzo-2.09.tar.gz new file mode 100644 index 0000000..01f39b5 --- /dev/null +++ b/lzo-2.09.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c +size 594855 diff --git a/lzo.changes b/lzo.changes index 38fc576..43d6988 100644 --- a/lzo.changes +++ b/lzo.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 24 20:20:31 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Update to 2.09 + * Work around gcc bug #64516 that could affect architectures like + armv4, armv5 and sparc. + ------------------------------------------------------------------- Thu Jul 24 18:07:43 CEST 2014 - dsterba@suse.cz diff --git a/lzo.spec b/lzo.spec index deb4126..c2e9cb9 100644 --- a/lzo.spec +++ b/lzo.spec @@ -1,7 +1,7 @@ # # spec file for package lzo # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,21 +17,20 @@ Name: lzo -Url: http://www.oberhumer.com/opensource/lzo/ -Version: 2.08 +Version: 2.09 Release: 0 +Summary: A Real-Time Data Compression Library +License: GPL-2.0+ +Group: Development/Libraries/C and C++ +Url: http://www.oberhumer.com/opensource/lzo/ Source: http://www.oberhumer.com/opensource/%{name}/download/%{name}-%{version}.tar.gz Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ +BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 Obsoletes: lzo-64bit %endif -# -Summary: A Real-Time Data Compression Library -License: GPL-2.0+ -Group: Development/Libraries/C and C++ %description LZO is a portable lossless data compression library written in ANSI C. @@ -40,12 +39,6 @@ Decompression requires no memory. LZO is suitable for data compression and decompression in real-time. This means it favors speed over compression ratio. - - -Authors: --------- - Markus Franz Xaver Johannes Oberhumer - %define library_package liblzo2-2 %package -n liblzo2-2 @@ -66,16 +59,10 @@ Decompression requires no memory. LZO is suitable for data compression and decompression in real-time. This means it favors speed over compression ratio. - - -Authors: --------- - Markus Franz Xaver Johannes Oberhumer - %package devel -Requires: %{library_package} = %{version} Summary: Development files for lzo Group: Development/Languages/C and C++ +Requires: %{library_package} = %{version} # bug437293 %ifarch ppc64 Obsoletes: lzo-devel-64bit @@ -89,17 +76,11 @@ Decompression requires no memory. LZO is suitable for data de-/compression in real-time. This means it favours speed over compression ratio. - - -Authors: --------- - Markus Franz Xaver Johannes Oberhumer - %package devel-static -Requires: lzo-devel = %{version} -Provides: lzo-devel:%{_libdir}/liblzo.a Summary: Development files for lzo Group: Development/Languages/C and C++ +Requires: lzo-devel = %{version} +Provides: lzo-devel:%{_libdir}/liblzo.a %description devel-static LZO is a portable lossless data compression library written in ANSI C. @@ -108,17 +89,11 @@ Decompression requires no memory. LZO is suitable for data de-/compression in real-time. This means it favours speed over compression ratio. - - -Authors: --------- - Markus Franz Xaver Johannes Oberhumer - %prep %setup -q %build -export CFLAGS="%optflags -fvisibility=hidden" +export CFLAGS="%{optflags} -fvisibility=hidden" %configure --enable-shared \ --enable-static \ --disable-silent-rules \ @@ -132,17 +107,14 @@ export CFLAGS="%optflags -fvisibility=hidden" echo '#define __LZO_EXPORT1 __attribute__ ((visibility ("default")))' >> config.h -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %check -%{__make} check test +make %{?_smp_mflags} check test %install -%makeinstall -%{__rm} -v %{buildroot}%{_libdir}/liblzo2.la - -%clean -%{__rm} -rf %{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm -v %{buildroot}%{_libdir}/liblzo2.la %post -n %{library_package} -p /sbin/ldconfig @@ -157,7 +129,7 @@ echo '#define __LZO_EXPORT1 __attribute__ ((visibility ("default")))' >> config. %doc AUTHORS BUGS COPYING NEWS README THANKS %doc doc/* util/* %{_libdir}/liblzo2.so -%_includedir/lzo +%{_includedir}/lzo %files devel-static %defattr (-,root,root)