Merge remote-tracking branch 'up/f29' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2018-08-26 17:26:23 +03:00
commit d201797f35
Signed by: davidlt
GPG Key ID: 7108702C938B13C1
1 changed files with 7 additions and 3 deletions

10
jq.spec
View File

@ -1,6 +1,6 @@
Name: jq
Version: 1.5
Release: 12.0.riscv64%{?dist}
Release: 13.0.riscv64%{?dist}
Summary: Command-line JSON processor
License: MIT and ASL 2.0 and CC-BY and GPLv3
@ -8,11 +8,12 @@ URL: http://stedolan.github.io/jq/
Source0: https://github.com/stedolan/jq/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
Patch0: CVE-2015-8863.patch
BuildRequires: gcc
BuildRequires: flex
BuildRequires: bison
BuildRequires: oniguruma-devel
%ifnarch s390 riscv64
%ifarch %{valgrind_arches}
BuildRequires: valgrind
%endif
@ -90,9 +91,12 @@ make check
%changelog
* Sat Apr 28 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.5-12.0.riscv64
* Sun Aug 26 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.5-13.0.riscv64
- Disable valgrind for riscv64 (not available upstream)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Apr 01 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.5-12
- Rebuild against oniguruma 6.8.1