Merge remote-tracking branch 'up/f29' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
commit
d201797f35
10
jq.spec
10
jq.spec
@ -1,6 +1,6 @@
|
|||||||
Name: jq
|
Name: jq
|
||||||
Version: 1.5
|
Version: 1.5
|
||||||
Release: 12.0.riscv64%{?dist}
|
Release: 13.0.riscv64%{?dist}
|
||||||
Summary: Command-line JSON processor
|
Summary: Command-line JSON processor
|
||||||
|
|
||||||
License: MIT and ASL 2.0 and CC-BY and GPLv3
|
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
|
Source0: https://github.com/stedolan/jq/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||||
Patch0: CVE-2015-8863.patch
|
Patch0: CVE-2015-8863.patch
|
||||||
|
|
||||||
|
BuildRequires: gcc
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: oniguruma-devel
|
BuildRequires: oniguruma-devel
|
||||||
|
|
||||||
%ifnarch s390 riscv64
|
%ifarch %{valgrind_arches}
|
||||||
BuildRequires: valgrind
|
BuildRequires: valgrind
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -90,9 +91,12 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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)
|
- 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
|
* Sun Apr 01 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.5-12
|
||||||
- Rebuild against oniguruma 6.8.1
|
- Rebuild against oniguruma 6.8.1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user