Remove the aarch64 test workaround, the patches causing
the failures have been dropped in zlib-1.2.11-25
This commit is contained in:
parent
db8f3f4c70
commit
5e13e8744a
13
libpng.spec
13
libpng.spec
@ -4,13 +4,12 @@ Summary: A library of functions for manipulating PNG image format files
|
|||||||
Name: libpng
|
Name: libpng
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 1.6.37
|
Version: 1.6.37
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
License: zlib
|
License: zlib
|
||||||
URL: http://www.libpng.org/pub/png/
|
URL: http://www.libpng.org/pub/png/
|
||||||
|
|
||||||
Source0: https://github.com/glennrp/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/glennrp/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
Source1: pngusr.dfa
|
Source1: pngusr.dfa
|
||||||
Source2: pngtest-aarch64.png
|
|
||||||
Patch0: libpng-multilib.patch
|
Patch0: libpng-multilib.patch
|
||||||
Patch1: libpng-fix-arm-neon.patch
|
Patch1: libpng-fix-arm-neon.patch
|
||||||
|
|
||||||
@ -63,12 +62,6 @@ The libpng-tools package contains tools used by the authors of libpng.
|
|||||||
# Provide pngusr.dfa for build.
|
# Provide pngusr.dfa for build.
|
||||||
cp -p %{SOURCE1} .
|
cp -p %{SOURCE1} .
|
||||||
|
|
||||||
%ifarch aarch64
|
|
||||||
# zlib on aarch64 produces output different from other arches:
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1665221
|
|
||||||
cp -p %{SOURCE2} pngtest.png
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1 -b .arm
|
%patch1 -p1 -b .arm
|
||||||
|
|
||||||
@ -111,6 +104,10 @@ make check
|
|||||||
%{_bindir}/pngfix
|
%{_bindir}/pngfix
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 24 2021 Nikola Forró <nforro@redhat.com> - 2:1.6.37-10
|
||||||
|
- Remove the aarch64 test workaround, the patches causing the failures
|
||||||
|
have been dropped in zlib-1.2.11-25
|
||||||
|
|
||||||
* Thu Feb 11 2021 Nikola Forró <nforro@redhat.com> - 2:1.6.37-9
|
* Thu Feb 11 2021 Nikola Forró <nforro@redhat.com> - 2:1.6.37-9
|
||||||
- Run %check by default
|
- Run %check by default
|
||||||
|
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 8.5 KiB |
Loading…
Reference in New Issue
Block a user