[cyrus-imapd] spec cleanup

[Michal Hlavinka]

commit 3924e4ecb24bf344e7600e5fd0df9ab52e215641
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Mar 22 11:37:15 2012 +0100

    spec cleanup

 cyrus-imapd-2.3.15-qos.patch     |   83 --------------------------------
 cyrus-imapd-2.3.16-nodenny.patch |   26 ----------
 cyrus-imapd-perl5.14.patch       |   96 --------------------------------------
 cyrus-imapd.spec                 |    9 +--
 4 files changed, 3 insertions(+), 211 deletions(-)
---
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 494a39c..6b05a20 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -39,9 +39,6 @@ Patch4: cyrus-imapd-2.3.1-authid_normalize.patch
 # fedora/rhel specific, find current db lib, rhbz#461875
 Patch6: cyrus-imapd-2.3.12p2-current-db.patch
 
-# temporary workaround, rhbz#553011, https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3206
-Patch7: cyrus-imapd-2.3.16-nodenny.patch
-
 # for c-i <= 2.4.12
 Patch8: cyrus-imapd-2.4.12-debugopt.patch
 
@@ -230,7 +227,7 @@ install -p -m 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -p -m 644 %{SOURCE7}   %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -p -m 755 %{SOURCE10}   %{buildroot}%{_sysconfdir}/cron.daily/%{name}
 
-install -p -D -m 644 %{SOURCE12}   %{buildroot}/lib/systemd/system/cyrus-imapd.service
+install -p -D -m 644 %{SOURCE12}   %{buildroot}%{_unitdir}/cyrus-imapd.service
 install -p -D -m 755 %{SOURCE13}   %{buildroot}%{_cyrexecdir}/cyr_systemd_helper
 
 # Cleanup of doc dir
@@ -360,7 +357,7 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/csync
 %config(noreplace) %{_sysconfdir}/pam.d/nntp
 %{_sysconfdir}/cron.daily/%{name}
-/lib/systemd/system/cyrus-imapd.service
+%{_unitdir}/cyrus-imapd.service
 %dir %{_cyrexecdir}
 %{_cyrexecdir}/cyr_systemd_helper
 %{_cyrexecdir}/arbitron
@@ -499,7 +496,7 @@ fi
 
 * Tue Nov 22 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.12-4
 - reduce noisy logging, add option to turn on LOG_DEBUG syslog 
-  messages again (thanks Philip	Prindeville) (#754940)
+  messages again (thanks Philip Prindeville) (#754940)
 
 * Mon Oct 24 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.12-3
 - add login and digest-md5 as part of default auth mechanisms (#748278)