Merge branch 'openssl' of https://github.com/PurpleI2P/i2pd into openssl

4 years ago · b9b431e82d
2 changed files with 19 additions and 6 deletions
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@ -77,14 +77,14 @@ popd
				@@ -77,14 +77,14 @@ popd
 %install
 pushd build

-%if 0%{?mageia}
-pushd build
-%endif
-
 %if 0%{?fedora} >= 33
 pushd %{_target_platform}
 %endif

+%if 0%{?mageia}
+pushd build
+%endif
+
 chrpath -d i2pd
 %{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
 %{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@ -54,18 +54,31 @@ cd build
				@@ -54,18 +54,31 @@ cd build
 %endif
 %endif

+%if 0%{?fedora} >= 33
+pushd %{_target_platform}
+%endif
+
 %if 0%{?mageia} > 7
 pushd build
+%endif
+
 make %{?_smp_mflags}
+
+%if 0%{?fedora} >= 33
 popd
-%else
-make %{?_smp_mflags}
 %endif

+%if 0%{?mageia} > 7
+popd
+%endif

 %install
 pushd build

+%if 0%{?fedora} >= 33
+pushd %{_target_platform}
+%endif
+
 %if 0%{?mageia}
 pushd build
 %endif