Accepting request 251516 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/251516
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xz?expand=0&rev=48
This commit is contained in:
Stephan Kulow 2014-09-29 10:40:10 +00:00 committed by Git OBS Bridge
commit c60980973b
6 changed files with 48 additions and 35 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a
size 1305685

Binary file not shown.

3
xz-5.0.7.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f4d2165553b9d0d82fd08bc2eacddeb48ebeb862a5686a603f8c044a2e52c93f
size 1317771

BIN
xz-5.0.7.tar.gz.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Sep 23 00:11:27 UTC 2014 - andreas.stieger@gmx.de
- xz 5.0.7:
* Fix regressions introduced in 5.0.6:
- Fix building with non-GNU make.
- Fix invalid Libs.private value in liblzma.pc which broke
static linking against liblzma if the linker flags were
taken from pkg-config.
- include changes from 5.0.6:
* xzgrep now exits with status 0 if at least one file matched.
* A few minor portability and build system fixes
-------------------------------------------------------------------
Sun Nov 24 16:25:53 UTC 2013 - andreas.stieger@gmx.de

64
xz.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xz
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products 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,6 +16,8 @@
#
# avoid bootstrapping problem
%define _binary_payload w9.bzdio
%if 0%{?centos_version} || 0%{?rhel_version}
%if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600}
%bcond_without static_libs
@ -23,36 +25,31 @@
%else
%bcond_with static_libs
%endif
%if 0%{?suse_version} < 1130
%define do_profiling 0
%endif
%ifarch aarch64 %{arm} %{sparc}
%define do_profiling 0
%endif
Name: xz
Version: 5.0.7
Release: 0
Summary: A Program for Compressing Files
License: LGPL-2.1+ and GPL-2.0+
Group: Productivity/Archiving/Compression
Version: 5.0.5
Release: 0
Url: http://tukaani.org/xz/
Source0: http://tukaani.org/xz/%{name}-%{version}.tar.gz
Source1: http://tukaani.org/xz/%{name}-%{version}.tar.gz.sig
Source2: baselibs.conf
# from http://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring
Source3: xz.keyring
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkgconfig
Provides: lzma = %version
Obsoletes: lzma < %version
%if 0%{?suse_version} < 1130
%define do_profiling 0
%endif
%ifarch aarch64 %{arm} %sparc
%define do_profiling 0
%endif
Provides: lzma = %{version}
Obsoletes: lzma < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?lang_package:1} > 0
Recommends: %name-lang
Recommends: %{name}-lang
%endif
# avoid bootstrapping problem
%define _binary_payload w9.bzdio
%description
The xz command is a very powerful program for compressing files.
@ -85,23 +82,24 @@ Library for encoding/decoding LZMA files.
Summary: Development package for the LZMA library
Group: Development/Libraries/C and C++
Requires: liblzma5 = %{version}
Provides: lzma-devel = %version
Obsoletes: lzma-devel < %version
Provides: lzma-alpha-devel = %version
Obsoletes: lzma-alpha-devel < %version
Provides: lzma-devel = %{version}
Obsoletes: lzma-devel < %{version}
Provides: lzma-alpha-devel = %{version}
Obsoletes: lzma-alpha-devel < %{version}
%description devel
This package contains the header files and libraries needed for
compiling programs using the LZMA library.
%if %{with static_libs}
%package static-devel
Summary: Static version of LZMA library
Group: Development/Libraries/C and C++
Requires: lzma-devel = %version
Requires: lzma-devel = %{version}
%description static-devel
Static library for the LZMA library
Static library for the LZMA library
%endif
%prep
@ -112,25 +110,25 @@ Static library for the LZMA library
%if %{do_profiling}
profiledir=$(mktemp -d)
trap "rm -rf $profiledir" EXIT
export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir"
export CFLAGS="%{optflags} %{cflags_profile_generate}=$profiledir"
%endif
%configure \
%if ! %{with static_libs}
--disable-static \
%endif
--with-pic \
--docdir=%_docdir/%name
--docdir=%{_docdir}/%{name}
make %{?_smp_mflags}
%if %{do_profiling}
time make check
make clean
export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir"
make clean %{?_smp_mflags}
export CFLAGS="%{optflags} %{cflags_profile_feedback}=$profiledir"
%configure \
%if %{without static_libs}
--disable-static \
%endif
--with-pic \
--docdir=%_docdir/%name
--docdir=%{_docdir}/%{name}
make %{?_smp_mflags}
%endif
@ -138,8 +136,8 @@ make %{?_smp_mflags}
time make check
%install
make install DESTDIR=$RPM_BUILD_ROOT
%{__rm} -v %{buildroot}%{_libdir}/liblzma.la
make DESTDIR=%{buildroot} install %{?_smp_mflags}
rm -v %{buildroot}%{_libdir}/liblzma.la
%find_lang %{name}
%post -n liblzma5 -p /sbin/ldconfig
@ -152,13 +150,14 @@ make install DESTDIR=$RPM_BUILD_ROOT
%defattr(-, root, root)
%files
%defattr(-,root,root)
%else
%files -f %{name}.lang
%defattr(-, root, root)
%endif
%defattr(-, root, root)
%_docdir/%name
%{_docdir}/%{name}
%{_bindir}/*
%{_mandir}/man?/*
@ -174,6 +173,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*.pc
%if %{with static_libs}
%files static-devel
%defattr(-, root, root)
%{_libdir}/*.a