Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/xz.git#191ea0dfb31716328e4359849b0a37db9fe13cf6
This commit is contained in:
DistroBaker 2021-02-03 22:43:30 +00:00
parent 530379994e
commit 3b25713183

12
xz.spec
View File

@ -4,21 +4,21 @@
Summary: LZMA compression utilities Summary: LZMA compression utilities
Name: xz Name: xz
Version: 5.2.5 Version: 5.2.5
Release: 4%{?dist} Release: 5%{?dist}
# Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are
# GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its
# OK), documentation is Public Domain. # OK), documentation is Public Domain.
License: GPLv2+ and Public Domain License: GPLv2+ and Public Domain
# official upstream release # official upstream release
Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz Source0: https://tukaani.org/%{name}/%{name}-%{version}.tar.xz
Source100: colorxzgrep.sh Source100: colorxzgrep.sh
Source101: colorxzgrep.csh Source101: colorxzgrep.csh
Patch1: xz-5.2.5-enable_CET.patch Patch1: xz-5.2.5-enable_CET.patch
URL: http://tukaani.org/%{name}/ URL: https://tukaani.org/%{name}/
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# For /usr/libexec/grepconf.sh (RHBZ#1189120). # For /usr/libexec/grepconf.sh (RHBZ#1189120).
@ -26,6 +26,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# have grepconf, but we're only concerned with F22 here. # have grepconf, but we're only concerned with F22 here.
Requires: grep >= 2.20-5 Requires: grep >= 2.20-5
BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
@ -159,7 +160,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
%changelog %changelog
* Mon Mar 30 2020 Ondrej Dubaj <odubaj@redhat.com> - 5.2.5-4 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 04 2021 Ondrej Dubaj <odubaj@redhat.com> - 5.2.5-4
- Enabled CET for i686 (#1910368) - Enabled CET for i686 (#1910368)
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-3 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-3