sync with fedora

Version: 5.2.4-2
This commit is contained in:
Pavel Raiskup 2018-05-11 13:21:40 +02:00
parent 6ed5e54a17
commit e696b32305
3 changed files with 28 additions and 11 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/xz-5.2.3.tar.xz
/xz-5.2.4.tar.xz

View File

@ -1 +1 @@
SHA512 (xz-5.2.3.tar.xz) = a5b8f3c402ec3df5c1875a32081136606dd7701190d8b8091bae1bac36553ebe3480985c8069bf5d9e24f374ea64b1fe22614d3eebac1c10e5d609701bceca95
003e4d0b1b1899fc6e3000b24feddf7c xz-5.2.4.tar.xz

35
xz.spec
View File

@ -3,8 +3,8 @@
Summary: LZMA compression utilities
Name: xz
Version: 5.2.3
Release: 7%{?dist}
Version: 5.2.4
Release: 2%{?dist}
# Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are
# GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its
@ -37,6 +37,7 @@ LZMA is a general purpose compression algorithm designed by Igor Pavlov as
part of 7-Zip. It provides high compression ratio while keeping the
decompression speed fast.
%package libs
Summary: Libraries for decoding LZMA compression
License: Public Domain
@ -45,6 +46,7 @@ Obsoletes: %{name}-compat-libs < %{version}-%{release}
%description libs
Libraries for decoding files compressed with LZMA or XZ utils.
%package static
Summary: Statically linked library for decoding LZMA compression
License: Public Domain
@ -53,6 +55,7 @@ License: Public Domain
Statically linked library for decoding files compressed with LZMA or
XZ utils. Most users should *not* install this.
%package devel
Summary: Devel libraries & headers for liblzma
License: Public Domain
@ -61,6 +64,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
Devel libraries and headers for liblzma.
%package lzma-compat
Summary: Older LZMA format compatibility binaries
# Just a set of symlinks to 'xz' + two Public Domain binaries.
@ -73,25 +77,21 @@ Provides: lzma = %{version}
The lzma-compat package contains compatibility links for older
commands that deal with the older LZMA format.
%prep
%autosetup
for i in `find . -name config.sub`; do
perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i
done
%build
CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
%ifarch %{power64}
CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|^-O2$|-O3|g' | xargs -n 100`
export CFLAGS="%{optflags} -O3"
%endif
export CFLAGS
%configure
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_build
%install
%make_install
rm -f %{buildroot}%{_libdir}/*.la
@ -104,11 +104,13 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir}
%find_lang %name
%check
LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
%ldconfig_scriptlets libs
%files -f %{name}.lang
%license %{_pkgdocdir}/COPYING*
%doc %{_pkgdocdir}
@ -117,14 +119,17 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
%{_mandir}/man1/*xz*
%{profiledir}/*
%files libs
%license %{_pkgdocdir}/COPYING
%{_libdir}/lib*.so.5*
%files static
%license %{_pkgdocdir}/COPYING
%{_libdir}/liblzma.a
%files devel
%dir %{_includedir}/lzma
%{_includedir}/lzma/*.h
@ -133,11 +138,23 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
%{_libdir}/pkgconfig/liblzma.pc
%doc %_pkgdocdir/examples*
%files lzma-compat
%{_bindir}/*lz*
%{_mandir}/man1/*lz*
%changelog
* Wed May 09 2018 Pavel Raiskup <praiskup@redhat.com> - 5.2.4-2
- drop ppc64p7 hack, per fedora devel list discussion:
https://lists.fedoraproject.org/archives/list/
devel@lists.fedoraproject.org/thread/2OWD2QRDFBEC6HTPVQ7FMJENH32BWT54/
- don't explicitly set _FILE_OFFSET_BITS, package uses AC_SYS_LARGEFILE
* Tue May 08 2018 Pavel Raiskup <praiskup@redhat.com> - 5.2.4-1
- rebase to 5.2.4 (rhbz#1574039), per release notes:
https://www.mail-archive.com/xz-devel@tukaani.org/msg00295.html
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild