[RPM/CI] Use openssl3 compatible source files on fedora>=35.

xrootd · Nov 23, 2021 · d9dd8c5 · d9dd8c5
1 parent f4b6e0c
commit d9dd8c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -132,7 +132,7 @@ build:fedorai-35:
     - ./makesrpm.sh --define "_with_python3 1" --define "_with_ceph11 1"
     - dnf builddep --nogpgcheck -y *.src.rpm
     - mkdir RPMS
-    - rpmbuild --rebuild --define "_rpmdir RPMS/" --define "_with_python3 1" --define "_with_ceph11 1" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" *.src.rpm
+    - rpmbuild --rebuild --define "_rpmdir RPMS/" --define "_with_python3 1" --define "_with_ceph11 1" --define "_with_openssl3 1" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" *.src.rpm
     - cd ..
     - mkdir fc-35/
     - cp packaging/*.src.rpm fc-35

diff --git a/packaging/rhel/xrootd.spec.in b/packaging/rhel/xrootd.spec.in
@@ -31,9 +31,9 @@
         %define use_systemd 0
     %endif
     # we only build python3 bindings for fedora
-	%define python2only 0
-	%define python3only 1
-	%define python2and3 0
+    %define python2only 0
+    %define python3only 1
+    %define python2and3 0
 %endif
 
 
@@ -555,6 +555,9 @@ cmake  \
 %if %{?_with_isal:1}%{!?_with_isal:0}
       -DENABLE_XRDEC=TRUE \
 %endif
+%if %{?_with_openssl3:1}%{!?_with_openssl3:0}
+      -DWITH_OPENSSL3=TRUE \
+%endif
 %if %{python3only}
       -DXRD_PYTHON_REQ_VERSION=%{python3_pkgversion} \
 %endif