summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2022-06-08 11:14:16 -0400
committerB Stack <bgstack15@gmail.com>2022-06-08 11:14:16 -0400
commit459bbe4010243bb2fed902f790917ff987068f3b (patch)
treecbc78a4a6c372bc1288ad85bb7cc46e192807455
parentffs: disable el8 libssh2-freefilesync BR (diff)
downloadstackrpms-459bbe4010243bb2fed902f790917ff987068f3b.tar.gz
stackrpms-459bbe4010243bb2fed902f790917ff987068f3b.tar.bz2
stackrpms-459bbe4010243bb2fed902f790917ff987068f3b.zip
ffs: parameterize openssl BR name
-rw-r--r--freefilesync/freefilesync.spec17
1 files changed, 9 insertions, 8 deletions
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index e1f5114..1aab5bb 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -6,7 +6,7 @@
%define min_libssh2 %{nil}
%define min_openssl %{nil}
%define scl_env %{nil}
-%define scl_buildreq coreutils
+%define scl_buildreq %{nil}
%if 0%{?el6}%{?el7}
%define scl_env devtoolset-7
%define scl_buildreq devtoolset-7-toolchain
@@ -22,9 +22,12 @@
%define min_openssl >= 1.1.1k
%endif
%define libssh2_name libssh2
+%define openssl_name openssl
# EL8 copr has some dnf module weirdness with libssh2, not a version problem.
%if 0%{?el6}%{?el7}
%define libssh2_name libssh2-freefilesync
+%define openssl_name openssl-freefilesync
+%define
%endif
%if 0%{?fedora} >= 36
# https://www.spinics.net/lists/fedora-devel/msg296646.html
@@ -90,20 +93,18 @@ BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(zlib)
# We need the binary so we can check version number
-BuildRequires: openssl
-%if 0%{?el6}%{?el7}
+BuildRequires: %{openssl_name}
+%if "%{?scl_buildreq}" != ""
BuildRequires: %{scl_buildreq}
+%endif
%if "%{?min_openssl}" != ""
-BuildRequires: openssl-%{name}-devel %{min_openssl}
+BuildRequires: %{openssl_name}-devel %{min_openssl}
%else
-BuildRequires: openssl-%{name}-devel
+BuildRequires: %{openssl_name}-devel
%endif
#Requires: libcurl %%{?min_libcurl}
#Requires: %%{libssh2_name} %%{?min_libssh2}
#Requires: openssl-%%{name}-libs %%{?min_openssl}
-%else
-BuildRequires: openssl-devel
-%endif
Requires: hicolor-icon-theme
Requires: xdg-utils
Provides: mimehandler(application/x-freefilesync-ffs)
bgstack15