From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 27 Dec 2014 11:46:26 +0000 (+0100)
Subject: Replace some hardcoded variables with macros
X-Git-Tag: rec-3.7.0-rc1~28^2~9^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d41ee1ad31a04c0c16d8ac8ba9fe1eb6bc02fa6f;p=thirdparty%2Fpdns.git

Replace some hardcoded variables with macros
---

diff --git a/pdns.spec b/pdns.spec
index 91bd679bd9..28b1f315cb 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -24,21 +24,21 @@ backend'.
 
 %files
 %defattr(-,root,root)
-/usr/sbin/pdns_server
-/usr/bin/pdns_control
-/usr/bin/zone2sql
-/usr/bin/zone2json
-/usr/bin/pdnssec
-#/usr/bin/zone2ldap
-/usr/man/man8/pdns_control.8
-/usr/man/man8/pdns_server.8
-/usr/man/man8/zone2sql.8
-/usr/man/man8/pdnssec.8
-/usr/share/doc/pdns/*.sql
+%{_sbindir}/pdns_server
+%{_bindir}/pdns_control
+%{_bindir}/zone2sql
+%{_bindir}/zone2json
+%{_bindir}/pdnssec
+#%{_bindir}/zone2ldap
+%{_mandir}/man8/pdns_control.8
+%{_mandir}/man8/pdns_server.8
+%{_mandir}/man8/zone2sql.8
+%{_mandir}/man8/pdnssec.8
+%{_datadir}/doc/pdns/*.sql
 
-%dir /etc/powerdns/
-%config(noreplace) /etc/powerdns/pdns.conf
-%config /etc/init.d/pdns
+%dir %{_sysconfdir}/powerdns/
+%config(noreplace) %{_sysconfdir}/powerdns/pdns.conf
+%config %{_sysconfdir}/init.d/pdns
 
 %post
 echo Remember to create a 'pdns' user before starting pdns
@@ -56,20 +56,20 @@ These are the tools
 
 %files -n pdns-tools
 %defattr(-,root,root)
-/usr/bin/dnsbulktest
-/usr/bin/dnsgram
-/usr/bin/dnsreplay
-/usr/bin/dnsscan
-/usr/bin/dnsscope
-/usr/bin/dnsdist
-/usr/bin/dnstcpbench
-/usr/bin/dnswasher
-/usr/bin/notify
-/usr/bin/nproxy
-/usr/bin/nsec3dig
-/usr/bin/saxfr
-/usr/man/man8/dnsreplay.1
-/usr/man/man8/dnsscope.1
-/usr/man/man8/dnswasher.1
-/usr/man/man1/dnstcpbench.1
-/usr/man/man1/dnsdist.1
+%{_bindir}/dnsbulktest
+%{_bindir}/dnsgram
+%{_bindir}/dnsreplay
+%{_bindir}/dnsscan
+%{_bindir}/dnsscope
+%{_bindir}/dnsdist
+%{_bindir}/dnstcpbench
+%{_bindir}/dnswasher
+%{_bindir}/notify
+%{_bindir}/nproxy
+%{_bindir}/nsec3dig
+%{_bindir}/saxfr
+%{_mandir}/man8/dnsreplay.1
+%{_mandir}/man8/dnsscope.1
+%{_mandir}/man8/dnswasher.1
+%{_mandir}/man1/dnstcpbench.1
+%{_mandir}/man1/dnsdist.1