[pdns] Rename zone2ldap to pdns-zone2ldap (#1193116)

Morten Stevens mstevens at fedoraproject.org
Tue Feb 17 16:05:05 UTC 2015


commit 79187b419cf067b65480072473d3ebbc9733fe8b
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Tue Feb 17 17:04:53 2015 +0100

    Rename zone2ldap to pdns-zone2ldap (#1193116)

 pdns.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/pdns.spec b/pdns.spec
index bad4126..fd1a60f 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -3,7 +3,7 @@
 
 Name: pdns
 Version: 3.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 Group: System Environment/Daemons
 License: GPLv2
@@ -199,9 +199,6 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
 	--enable-remotebackend-zeromq \
 	--enable-unit-tests
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
 %install
@@ -212,6 +209,10 @@ make install DESTDIR=%{buildroot}
 
 chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf
 
+# rename zone2ldap to pdns-zone2ldap (#1193116)
+%{__mv} %{buildroot}/%{_bindir}/zone2ldap %{buildroot}/%{_bindir}/pdns-zone2ldap
+%{__mv} %{buildroot}/%{_mandir}/man1/zone2ldap.1 %{buildroot}/%{_mandir}/man1/pdns-zone2ldap.1
+
 # install systemd unit file
 %{__install} -D -p -m 644 contrib/systemd-pdns.service %{buildroot}%{_unitdir}/%{name}.service
 
@@ -248,7 +249,7 @@ exit 0
 %doc COPYING README
 %{_bindir}/pdns_control
 %{_bindir}/pdnssec
-%{_bindir}/zone2ldap
+%{_bindir}/pdns-zone2ldap
 %{_bindir}/zone2sql
 %{_bindir}/zone2json
 %{_bindir}/zone2lmdb
@@ -257,7 +258,7 @@ exit 0
 %{_mandir}/man1/pdns_control.1.gz
 %{_mandir}/man1/pdns_server.1.gz
 %{_mandir}/man1/zone2sql.1.gz
-%{_mandir}/man1/zone2ldap.1.gz
+%{_mandir}/man1/pdns-zone2ldap.1.gz
 %{_mandir}/man1/pdnssec.1.gz
 %{_unitdir}/pdns.service
 %dir %{_libdir}/%{name}/
@@ -331,6 +332,10 @@ exit 0
 %{_libdir}/%{name}/liblmdbbackend.so
 
 %changelog
+* Tue Feb 17 2015 Morten Stevens <mstevens at imt-systems.com> - 3.4.2-2
+- Rename zone2ldap to pdns-zone2ldap (#1193116)
+- Remove rpath workaround
+
 * Sat Feb 07 2015 Morten Stevens <mstevens at imt-systems.com> - 3.4.2-1
 - Update to 3.4.2
 - Disable security status polling by default


More information about the scm-commits mailing list