[rpm] add Fedora ELN support

Signed-off-by: r4sas <r4sas@i2pmail.org>

contrib/rpm/i2pd-git.spec

@@ -28,9 +28,11 @@ Requires:      logrotate
 Requires:      systemd
 Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
 
+
 %description
 C++ implementation of I2P.
 
+
 %prep
 %setup -q -n i2pd-openssl
 
@@ -56,55 +58,39 @@ cd build
   %endif
 %endif
 
-
-%if 0%{?rhel} == 9
-pushd redhat-linux-build
-%endif
-
-%if 0%{?fedora} >= 35
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
   pushd redhat-linux-build
 %else
   %if 0%{?fedora} >= 33
     pushd %{_target_platform}
   %endif
-%endif
 
   %if 0%{?mageia} > 7
     pushd build
   %endif
+%endif
 
 make %{?_smp_mflags}
 
-%if 0%{?rhel} == 9
-popd
-%endif
-
-%if 0%{?fedora} >= 33
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
   popd
 %endif
 
-%if 0%{?mageia} > 7
-popd
-%endif
 
 %install
 pushd build
 
-%if 0%{?rhel} == 9
-pushd redhat-linux-build
-%endif
-
-%if 0%{?fedora} >= 35
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
   pushd redhat-linux-build
 %else
   %if 0%{?fedora} >= 33
     pushd %{_target_platform}
   %endif
-%endif
 
   %if 0%{?mageia}
     pushd build
   %endif
+%endif
 
 chrpath -d i2pd
 %{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd

contrib/rpm/i2pd.spec

@@ -1,6 +1,6 @@
 Name:          i2pd
 Version:       2.48.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd-git
 
@@ -26,9 +26,11 @@ Requires:      logrotate
 Requires:      systemd
 Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
 
+
 %description
 C++ implementation of I2P.
 
+
 %prep
 %setup -q
 
@@ -54,54 +56,39 @@ cd build
   %endif
 %endif
 
-%if 0%{?rhel} == 9
-pushd redhat-linux-build
-%endif
-
-%if 0%{?fedora} >= 35
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
   pushd redhat-linux-build
 %else
   %if 0%{?fedora} >= 33
     pushd %{_target_platform}
   %endif
-%endif
 
   %if 0%{?mageia} > 7
     pushd build
   %endif
+%endif
 
 make %{?_smp_mflags}
 
-%if 0%{?rhel} == 9
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
   popd
 %endif
 
-%if 0%{?fedora} >= 33
-popd
-%endif
-
-%if 0%{?mageia} > 7
-popd
-%endif
 
 %install
 pushd build
 
-%if 0%{?rhel} == 9
-pushd redhat-linux-build
-%endif
-
-%if 0%{?fedora} >= 35
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
   pushd redhat-linux-build
 %else
   %if 0%{?fedora} >= 33
     pushd %{_target_platform}
   %endif
-%endif
 
   %if 0%{?mageia}
     pushd build
   %endif
+%endif
 
 chrpath -d i2pd
 %{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd