Browse Source

[rpm] try fix build on fedora rawhide

Signed-off-by: R4SAS <r4sas@i2pmail.org>
pull/1687/head
R4SAS 3 years ago
parent
commit
33355c0abe
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
  1. 12
      contrib/rpm/i2pd-git.spec
  2. 28
      contrib/rpm/i2pd.spec

12
contrib/rpm/i2pd-git.spec

@ -11,9 +11,9 @@ URL: https://github.com/PurpleI2P/i2pd
Source0: https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz Source0: https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
BuildRequires: cmake3 BuildRequires: cmake3
%else %else
BuildRequires: cmake BuildRequires: cmake
%endif %endif
BuildRequires: chrpath BuildRequires: chrpath
@ -82,8 +82,12 @@ make %{?_smp_mflags}
%install %install
pushd build pushd build
%if 0%{?fedora} >= 33 %if 0%{?fedora} >= 36
pushd %{_target_platform} pushd redhat-linux-build
%else
%if 0%{?fedora} >= 33
pushd %{_target_platform}
%endif
%endif %endif
%if 0%{?mageia} %if 0%{?mageia}

28
contrib/rpm/i2pd.spec

@ -9,9 +9,9 @@ URL: https://github.com/PurpleI2P/i2pd
Source0: https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz Source0: https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
BuildRequires: cmake3 BuildRequires: cmake3
%else %else
BuildRequires: cmake BuildRequires: cmake
%endif %endif
BuildRequires: chrpath BuildRequires: chrpath
@ -54,33 +54,41 @@ cd build
%endif %endif
%endif %endif
%if 0%{?fedora} >= 33 %if 0%{?fedora} >= 36
pushd %{_target_platform} pushd redhat-linux-build
%else
%if 0%{?fedora} >= 33
pushd %{_target_platform}
%endif
%endif %endif
%if 0%{?mageia} > 7 %if 0%{?mageia} > 7
pushd build pushd build
%endif %endif
make %{?_smp_mflags} make %{?_smp_mflags}
%if 0%{?fedora} >= 33 %if 0%{?fedora} >= 33
popd popd
%endif %endif
%if 0%{?mageia} > 7 %if 0%{?mageia} > 7
popd popd
%endif %endif
%install %install
pushd build pushd build
%if 0%{?fedora} >= 33 %if 0%{?fedora} >= 36
pushd %{_target_platform} pushd redhat-linux-build
%else
%if 0%{?fedora} >= 33
pushd %{_target_platform}
%endif
%endif %endif
%if 0%{?mageia} %if 0%{?mageia}
pushd build pushd build
%endif %endif
chrpath -d i2pd chrpath -d i2pd

Loading…
Cancel
Save