Merge remote-tracking branch 'arne_f/autoconf'

[people/arne_f/ipfire-3.x.git] / freeradius / freeradius.nm

diff --git a/freeradius/freeradius.nm b/freeradius/freeradius.nm
index 62b72897bd28d8cfb946285284b52b1556012916..eec0ec21eff7103f7644cb2fe9621412cab83f5b 100644 (file)
--- a/freeradius/freeradius.nm
+++ b/freeradius/freeradius.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = freeradius-server
+name       = freeradius
 version    = 2.1.12
-release    = 3
+release    = 4
+thisapp    = %{name}-server-%{version}
 
 groups     = System/Daemons
 url        = http://www.freeradius.org
@@ -37,9 +38,7 @@ build
 
        configure_options +=\
                %{CONFIGURE_ARCH} \
-               --sysconfdir=/etc \
-               --libdir=/usr/lib/freeradius \
-               --localstatedir=/var \
+               --libdir=%{libdir}/freeradius \
                --with-system-libtool \
                --with-threads \
                --with-thread-pool \
@@ -97,7 +96,7 @@ end
 
 quality-agent
        whitelist_rpath
-               /usr/lib/freeradius
+               %{libdir}/freeradius
        end
 end
 
@@ -107,21 +106,24 @@ packages
                        /etc/raddb/radiusd.conf
                end
 
-               prerequires = shadow-utils systemd-units
+               prerequires
+                       shadow-utils
+                       systemd-units
+               end
 
                script prein
                        %{create_user}
                end
-       
+
                script postin
                        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
                end
-       
+
                script preun
                        /bin/systemctl --no-reload disable freeradius.service >/dev/null 2>&1 || :
                        /bin/systemctl stop freeradius.service >/dev/null 2>&1 || :
                end
-       
+
                script postup
                        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
                        /bin/systemctl try-restart freeradius.service >/dev/null 2>&1 || :
@@ -152,4 +154,8 @@ packages
                        /usr/share/man/man8/rlm_ippool_tool.8
                end
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end