Fix a regression introduced in the 3.0-33

Some fo the build flags (e.g. unicode support) were dropped by the
changes in the previous commit.

Resolves: rhbz#2162688
This commit is contained in:
Jakub Martisko 2023-01-31 15:18:34 +01:00
parent 8a2539cbf9
commit 2f8860660b
1 changed files with 8 additions and 4 deletions

View File

@ -1,7 +1,7 @@
Summary: A file compression and packaging utility compatible with PKZIP
Name: zip
Version: 3.0
Release: 33%{?dist}
Release: 34%{?dist}
License: BSD
Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz
URL: http://www.info-zip.org/Zip.html
@ -41,9 +41,9 @@ program.
%patch7 -p1
%build
sed -i -e 's:-DASM_CRC::g' unix/configure
sed -i -e 's:CRC32OA="crc_gcc.o":CRC32OA="":g' unix/configure
sed -i -e 's:OBJA=.*:OBJA="":g' unix/configure
#Remove assembly file to force the c implementation of the crc functions
#Related to 3.0-33 and 3.0-34
rm crc_i386.S
make -f unix/Makefile prefix=%{_prefix} CFLAGS_NOOPT="-I. -DUNIX -DNO_ASM $RPM_OPT_FLAGS" LFLAGS2="%{?__global_ldflags}" generic_gcc %{?_smp_mflags}
@ -68,6 +68,10 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \
%{_mandir}/man1/zipsplit.1*
%changelog
* 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
Resolves: rhbz#2162688
* Tue Feb 15 2022 Jakub Martisko <jamartis@redhat.com> - 3.0-33
- Disable the asm implementation of some functions and use the C instead
- This should fix some of the annocheck issues