Fix the annocheck issus from 3-0-33 without reintroducing the regression from 3.0-34

Related: rhbz#2162688
This commit is contained in:
Jakub Martisko 2023-02-14 15:48:04 +01:00
parent 2f8860660b
commit 5985b742a2

View File

@ -1,7 +1,7 @@
Summary: A file compression and packaging utility compatible with PKZIP Summary: A file compression and packaging utility compatible with PKZIP
Name: zip Name: zip
Version: 3.0 Version: 3.0
Release: 34%{?dist} Release: 35%{?dist}
License: BSD License: BSD
Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz
URL: http://www.info-zip.org/Zip.html URL: http://www.info-zip.org/Zip.html
@ -44,6 +44,7 @@ program.
#Remove assembly file to force the c implementation of the crc functions #Remove assembly file to force the c implementation of the crc functions
#Related to 3.0-33 and 3.0-34 #Related to 3.0-33 and 3.0-34
rm crc_i386.S rm crc_i386.S
rm match.S
make -f unix/Makefile prefix=%{_prefix} CFLAGS_NOOPT="-I. -DUNIX -DNO_ASM $RPM_OPT_FLAGS" LFLAGS2="%{?__global_ldflags}" generic_gcc %{?_smp_mflags} make -f unix/Makefile prefix=%{_prefix} CFLAGS_NOOPT="-I. -DUNIX -DNO_ASM $RPM_OPT_FLAGS" LFLAGS2="%{?__global_ldflags}" generic_gcc %{?_smp_mflags}
@ -68,6 +69,10 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \
%{_mandir}/man1/zipsplit.1* %{_mandir}/man1/zipsplit.1*
%changelog %changelog
* Tue Feb 14 2023 Jakub Martisko <jamartis@redhat.com> - 3.0-35
- Fix the annocheck issus from 3-0-33 without reintroducing the regression from 3.0-34
Related: rhbz#2162688
* Tue Jan 31 2023 Jakub Martisko <jamartis@redhat.com> - 3.0-34 * Tue Jan 31 2023 Jakub Martisko <jamartis@redhat.com> - 3.0-34
- Fix the regression introduced in 3.0-33 that caused some of the zip build flags to be dropped - Fix the regression introduced in 3.0-33 that caused some of the zip build flags to be dropped
Resolves: rhbz#2162688 Resolves: rhbz#2162688