diff --git a/build/megacmd/debian.rules b/build/megacmd/debian.rules index 7b18e238..46f59103 100644 --- a/build/megacmd/debian.rules +++ b/build/megacmd/debian.rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f NJOBS := $(shell echo ${DEB_BUILD_OPTIONS} | sed -rn 's/.*parallel=([0-9]*).*/\1/p') -CPPFLAGS := $(shell cat /etc/issue | grep "Ubuntu 1[234579]\|Debian.* [78]\|Ubuntu 1[68].10" >/dev/null && echo "$$CPPFLAGS -DMEGACMD_DEPRECATED_OS" || echo "") +CPPFLAGS := $(shell cat /etc/issue | grep "Ubuntu 1[234579]\|Ubuntu 18.10\|Ubuntu 20.10\|Ubuntu 21\|Debian.* [789]\|Debian.* 10" >/dev/null && echo "$$CPPFLAGS -DMEGACMD_DEPRECATED_OS" || echo "") FCRYPTOPP := $(shell cat /etc/issue | grep "Ubuntu 1[4-8]\|Ubuntu 19.04\|Debian.* [8]" >/dev/null && echo "" || echo "-q") WCRYPTOPP := $(shell cat /etc/issue | grep "Ubuntu 1[4-8]\|Ubuntu 19.04\|Debian.* [8]" >/dev/null && echo "" || echo "--with-cryptopp=$(CURDIR)/deps") DPKGXZ := $(shell cat /etc/issue | grep "Ubuntu 23\|Lunar Lobster\|Ubuntu 22\|Jammy Jellyfish\|Ubuntu 21.10" >/dev/null && echo "-- -Zxz" || echo "") diff --git a/build/templates/megacmd/megacmd.spec b/build/templates/megacmd/megacmd.spec index 72dd8098..4d74cb5f 100644 --- a/build/templates/megacmd/megacmd.spec +++ b/build/templates/megacmd/megacmd.spec @@ -169,7 +169,7 @@ bash -x ./contrib/build_sdk.sh %{flag_cryptopp} %{flag_libraw} %{flag_cares} -o ln -sfr $PWD/deps/lib/libfreeimage*.so $PWD/deps/lib/libfreeimage.so.3 ln -sfn libfreeimage.so.3 $PWD/deps/lib/libfreeimage.so -%if ( 0%{?fedora_version} && 0%{?fedora_version}<=31 ) || ( 0%{?centos_version} == 600 ) || ( 0%{?sle_version} && 0%{?sle_version} < 150000 ) +%if ( 0%{?fedora_version} && 0%{?fedora_version}<=35 ) || ( 0%{?centos_version} == 600 ) || ( 0%{?centos_version} == 800 ) || ( 0%{?sle_version} && 0%{?sle_version} < 150400 ) export CPPFLAGS="$CPPFLAGS -DMEGACMD_DEPRECATED_OS" %endif