rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Aditional fix of string quoting for rpm >= 4.16"

Browse Source 
This reverts commit 8e28ecd511.

Reasoning: The partentheses must be around both (the macro and "64") or none, so it will be the same type comparsion (number-number || string-string)
This commit is contained in:
Michal Schorm 2020-04-14 15:15:32 +02:00
parent 8e28ecd511
commit b44b18ea82
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mariadb.spec
View File

@ -1025,7 +1025,7 @@ rm %{buildroot}%{logrotateddir}/mysql
rm -r %{buildroot}%{_datadir}/%{pkg_name}/policy/apparmor
# Buildroot does not have symlink /lib64 --> /usr/lib64
%if "%{__isa_bits}" == 64 && 0%{?fedora}
%if %{__isa_bits} == 64 && 0%{?fedora}
mv %{buildroot}/lib64/security %{buildroot}%{_libdir}
%else
mv %{buildroot}/lib/security %{buildroot}%{_libdir}
@ -1160,7 +1160,7 @@ rm %{buildroot}%{_mandir}/man1/{mysql_,mariadb-}ldb.1*
# hack to let 32- and 64-bit tests run concurrently on same build machine
export MTR_PARALLEL=1
# builds might happen at the same host, avoid collision
export MTR_BUILD_THREAD="%{__isa_bits}"
export MTR_BUILD_THREAD=%{__isa_bits}
# The cmake build scripts don't provide any simple way to control the
# options for mysql-test-run, so ignore the make target and just call it