[dnrd] Cleanup.

Wed Aug 7 12:04:22 UTC 2013

commit cd3d39f3e0cb31774a49a5a5ad113ce7c18b9f52
Author: Christopher Meng <rpm at cicku.me>
Date:   Wed Aug 7 20:03:59 2013 +0800

    Cleanup.

 dnrd.spec |  108 +++++++++++++++++++++++-------------------------------------
 1 files changed, 42 insertions(+), 66 deletions(-)
---

diff --git a/dnrd.spec b/dnrd.spec
index e47afed..c76b17c 100644
--- a/dnrd.spec
+++ b/dnrd.spec
@@ -1,29 +1,25 @@
-Name:           dnrd
-Version:        2.20.3
-Release:        12%{?dist}
-Summary:        A caching, forwarding DNS proxy server
-
-Group:          System Environment/Daemons
-License:        GPLv2
-URL:            http://dnrd.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        dnrd.service
-Source2:        dnrd.conf.sample
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-#Requires(post): /sbin/chkconfig
-#Requires(preun):/sbin/chkconfig 
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-
+%global _hardened_build 1
+
+Name:              dnrd
+Version:           2.20.3
+Release:           12%{?dist}
+Summary:           Domain Name Relay Daemon
+License:           GPLv2
+URL:               http://dnrd.sourceforge.net
+Source0:           http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:           %{name}.service
+Source2:           %{name}.conf.sample
+BuildRequires:     systemd
+Requires(post):    systemd
+Requires(preun):   systemd
+Requires(postun):  systemd
 
 %description
-
-dnrd is a proxying nameserver. It forwards DNS queries to the
-appropriate nameserver, but can also act as the primary nameserver for
-a subnet behind a firewall. It also has features such as caching DNS
-requests, support for DNS servers, cache poisoning prevention, TCP
-support, etc..
+Domain Name Relay Daemon(dnrd) is a caching, forwarding DNS proxy server. It 
+forwards DNS queries to the appropriate nameserver, but can also act as the 
+primary nameserver for a subnet behind a firewall. It also has features such 
+as caching DNS requests, support for DNS servers, cache poisoning prevention, 
+TCP support, etc..
 
 %prep
 %setup -q
@@ -34,44 +30,20 @@ sed -i 's/\r//' COPYING
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dnrd.conf
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -p -m755 %SOURCE1 $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install INSTALL="install -p" DESTDIR=%{buildroot}
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
+install -p -m644 %{S:2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+mkdir -p %{buildroot}%{_unitdir}
+install -p -m755 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
 
 %post
-#if [ $1 == 1 ]; then
-#         /sbin/chkconfig --add %{name} > /dev/null 2>&1
-#fi
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
+%systemd_post %{name}.service
 
 %preun
-#if [ $1 == 0 ]; then
-#         /sbin/service %{name} stop > /dev/null 2>&1
-#         /sbin/chkconfig --del %{name} > /dev/null 2>&1
-#fi
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable dnrd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop dnrd.service > /dev/null 2>&1 || :
-fi
+%systemd_preun %{name}.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart dnrd.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart %{name}.service
 
 %triggerun -- dnrd < 2.20.3-9
 # Save the current service runlevel info
@@ -83,18 +55,22 @@ fi
 /sbin/chkconfig --del dnrd >/dev/null 2>&1 || :
 /bin/systemctl try-restart dnrd.service >/dev/null 2>&1 || :
 
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README doc/README-cache
 %doc doc/README-master doc/master.sample
-%{_mandir}/man8/%{name}.8.gz
+%{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
 %{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/dnrd.conf
 
 %changelog
+* Wed Aug 07 2013 Christopher Meng <rpm at cicku.me> - 2.20.3-13
+- Build with PIE support(BZ#958037).
+- Migrating to new systemd macro(BZ#850095).
+- Add systemd BR fix FTBFS(BZ#925266).
+- SPEC cleanup.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.20.3-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -119,15 +95,15 @@ fi
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.20.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Jul 16 2008 Rakesh Pandit <rakesh at fedoraproject.org> 2.20.3-4
- - Fixed license tag -- missed in last update.
+* Wed Jul 16 2008 Rakesh Pandit <rakesh at fedoraproject.org> 2.20.3-4
+- Fixed license tag -- missed in last update.
 
 * Tue Jul 15 2008 Rakesh Pandit <rakesh at fedoraproject.org> 2.20.3-3
- - Fixed license issue and removed duplicate files 
+- Fixed license issue and removed duplicate files 
 
 * Mon Jul 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> 2.20.3-2
- - Removed dos2unix dependency, created /etc/dnrd/ config file folder
- - Added init.d script and an example conf file, Corrected release number
+- Removed dos2unix dependency, created /etc/dnrd/ config file folder
+- Added init.d script and an example conf file, Corrected release number
  
-* Tue Jun 18 2008 Rakesh Pandit <rakesh at fedoraproject.org> 2.20.3-1
- - Initial packaged version
+* Wed Jun 18 2008 Rakesh Pandit <rakesh at fedoraproject.org> 2.20.3-1
+- Initial packaged version
