Fix RPM spec and "make rpm" (#4572)

diff --git a/Makefile b/Makefile
index 564a35a46075cdce9d22f4645e7f68d01e46568d..d0c4c357d4468c2595b18001596d98549d69f0b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -447,7 +447,7 @@ rpm: rpmbuild/SOURCES/freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
                echo "ERROR: Required depdendencies not found, install them with: yum-builddep redhat/freeradius.spec"; \
                exit 1; \
        fi
-       @QA_RPATHS=0x0003 rpmbuild --define "_topdir `pwd`/rpmbuild" -bb redhat/freeradius.spec
+       @cwd=`pwd` && cd redhat && QA_RPATHS=0x0003 rpmbuild --define "_topdir $$cwd/rpmbuild" -bb freeradius.spec
 
 # Developer checks
 .PHONY: warnings

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 970620b08292be7a4ad9c44bc4724d3616f13484..8784d0f2aa4e13177d4108c9fbec95bbfe8d4695 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -266,9 +266,6 @@ Requires: freeradius-libfreeradius-json = %{version}-%{release}
 %description json
 This plugin provides JSON tree mapping, and JSON string escaping for the FreeRADIUS server project.
 
-%description krb5
-This plugin provides Kerberos 5 support for the FreeRADIUS server project.
-
 %package krb5
 Summary: Kerberos 5 support for FreeRADIUS
 Group: System Environment/Daemons

diff --git a/redhat/kafka.inc b/redhat/kafka.inc
index 46af56cfdf6abc85e174d353e9a459fc336fa601..51977be5172f15a03da73e694561ec57d50aa23d 100644 (file)
--- a/redhat/kafka.inc
+++ b/redhat/kafka.inc
@@ -5,7 +5,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: librdkafka
 BuildRequires: librdkafka-devel
 
-%description libfreeradius-radius
+%description libfreeradius-kafka
 Provides common functions for Kafka production and consumer modules
 
 %files libfreeradius-kafka
@@ -20,7 +20,7 @@ Requires: librdkafka
 Requires: freeradius-libfreeradius-kafka = %{version}-%{release}
 BuildRequires: librdkafka-devel
 
-%description Kafka
+%description kafka
 Provides a producer module to push messages into a Kafka queue
 
 %files kafka