From 9c0051e73b9f56013ea613af621a53eab47d6ae5 Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Wed, 4 Jun 2025 13:49:44 +0300
Subject: [PATCH] [rpm] fix build on centos 10, drop 7th support

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 contrib/rpm/i2pd-git.spec | 34 +++++++++++-----------------------
 contrib/rpm/i2pd.spec     | 34 +++++++++++-----------------------
 2 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index fd431347..d9393f47 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -10,11 +10,7 @@ License:       BSD
 URL:           https://github.com/PurpleI2P/i2pd
 Source0:       https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz
 
-%if 0%{?rhel} == 7
-BuildRequires: cmake3
-%else
 BuildRequires: cmake
-%endif
 
 BuildRequires: chrpath
 BuildRequires: gcc-c++
@@ -43,26 +39,18 @@ C++ implementation of I2P.
 
 %build
 cd build
-%if 0%{?rhel} == 7
-  %cmake3 \
-    -DWITH_LIBRARY=OFF \
-    -DWITH_UPNP=ON \
-    -DWITH_HARDENING=ON \
-    -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake \
+  -DWITH_LIBRARY=OFF \
+  -DWITH_UPNP=ON \
+  -DWITH_HARDENING=ON \
+%if 0%{?fedora} > 29
+  -DBUILD_SHARED_LIBS:BOOL=OFF \
+  .
 %else
-  %cmake \
-    -DWITH_LIBRARY=OFF \
-    -DWITH_UPNP=ON \
-    -DWITH_HARDENING=ON \
-  %if 0%{?fedora} > 29
-    -DBUILD_SHARED_LIBS:BOOL=OFF \
-    .
-  %else
-    -DBUILD_SHARED_LIBS:BOOL=OFF
-  %endif
+  -DBUILD_SHARED_LIBS:BOOL=OFF
 %endif
 
-%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
+%if 0%{?rhel} >= 9 || 0%{?fedora} >= 35 || 0%{?eln}
   pushd redhat-linux-build
 %else
   %if 0%{?fedora} >= 33
@@ -76,7 +64,7 @@ cd build
 
 make %{?_smp_mflags}
 
-%if 0%{?rhel} == 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
+%if 0%{?rhel} >= 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
   popd
 %endif
 
@@ -84,7 +72,7 @@ make %{?_smp_mflags}
 %install
 pushd build
 
-%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
+%if 0%{?rhel} >= 9 || 0%{?fedora} >= 35 || 0%{?eln}
   pushd redhat-linux-build
 %else
   %if 0%{?fedora} >= 33
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index 2d3d4cbb..e094c3b7 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -8,11 +8,7 @@ License:       BSD
 URL:           https://github.com/PurpleI2P/i2pd
 Source0:       https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
 
-%if 0%{?rhel} == 7
-BuildRequires: cmake3
-%else
 BuildRequires: cmake
-%endif
 
 BuildRequires: chrpath
 BuildRequires: gcc-c++
@@ -41,26 +37,18 @@ C++ implementation of I2P.
 
 %build
 cd build
-%if 0%{?rhel} == 7
-  %cmake3 \
-    -DWITH_LIBRARY=OFF \
-    -DWITH_UPNP=ON \
-    -DWITH_HARDENING=ON \
-    -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake \
+  -DWITH_LIBRARY=OFF \
+  -DWITH_UPNP=ON \
+  -DWITH_HARDENING=ON \
+%if 0%{?fedora} > 29
+  -DBUILD_SHARED_LIBS:BOOL=OFF \
+  .
 %else
-  %cmake \
-    -DWITH_LIBRARY=OFF \
-    -DWITH_UPNP=ON \
-    -DWITH_HARDENING=ON \
-  %if 0%{?fedora} > 29
-    -DBUILD_SHARED_LIBS:BOOL=OFF \
-    .
-  %else
-    -DBUILD_SHARED_LIBS:BOOL=OFF
-  %endif
+  -DBUILD_SHARED_LIBS:BOOL=OFF
 %endif
 
-%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
+%if 0%{?rhel} >= 9 || 0%{?fedora} >= 35 || 0%{?eln}
   pushd redhat-linux-build
 %else
   %if 0%{?fedora} >= 33
@@ -74,7 +62,7 @@ cd build
 
 make %{?_smp_mflags}
 
-%if 0%{?rhel} == 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
+%if 0%{?rhel} >= 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
   popd
 %endif
 
@@ -82,7 +70,7 @@ make %{?_smp_mflags}
 %install
 pushd build
 
-%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
+%if 0%{?rhel} >= 9 || 0%{?fedora} >= 35 || 0%{?eln}
   pushd redhat-linux-build
 %else
   %if 0%{?fedora} >= 33