Try again to fix spec include paths

diff --git a/.github/workflows/ci-rpm.yml b/.github/workflows/ci-rpm.yml
index 1ed5a9dc3d525314df62b9999644fb587b8345c2..604db9b8bb31f709445765aec86428f43f797f5e 100644 (file)
--- a/.github/workflows/ci-rpm.yml
+++ b/.github/workflows/ci-rpm.yml
@@ -136,17 +136,13 @@ jobs:
       run: |
         yum install -y procps-ng
 
-    - name: Install build dependencies
-      run: |
-        yum-builddep -y freeradius/redhat/freeradius.spec
-
     #
     #  It has been observed that sometimes not all the dependencies are
     #  installed on the first go.  Give it a second chance.
     #
-    - name: Second run of install build dependencies
+    - name: Install build dependencies
       run: |
-        yum-builddep -y redhat/freeradius.spec
+        yum-builddep -y redhat/freeradius.spec && yum-builddep -y redhat/freeradius.spec
       working-directory: freeradius
 
     - name: Build RPMs

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 1b7fcfb71304daccf43e603e49cbeb62dff78719..f56fa348161805fa789c2cc5183206a5a617fe45 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -216,7 +216,7 @@ BuildRequires: json-c-devel >= 0.13
 %description libfreeradius-json
 Internal support library for FreeRADIUS modules using json-c, required by all modules that use json-c.
 
-%include ./kafka.inc
+%include %{_topdir}/kafka.inc
 
 %package libfreeradius-radius
 Summary: RADIUS protocol library for FreeRADIUS