[mailman] move mailman-update-cfg to /usr/lib/mailman/bin

[Jan Kaluža]

commit 443bc3169ec5294b8df3dbcf226cc41444abfdbe
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Thu Apr 4 11:15:43 2013 +0200

    move mailman-update-cfg to /usr/lib/mailman/bin

 mailman.service |    4 ++--
 mailman.spec    |   13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/mailman.service b/mailman.service
index 65bb52a..712e1b8 100644
--- a/mailman.service
+++ b/mailman.service
@@ -3,14 +3,14 @@ Description=GNU Mailing List Manager
 After=syslog.target network.target
 
 [Service]
-ExecStartPre=/usr/bin/mailman-update-cfg
+ExecStartPre=/usr/lib/mailman/bin/mailman-update-cfg
 ExecStartPre=/usr/bin/install -m644 -o root -g root /usr/lib/mailman/cron/crontab.in /etc/cron.d/mailman
 ExecStartPre=/bin/touch /var/log/mailman/error
 ExecStartPre=/bin/chown mailman:mailman /var/log/mailman/error
 ExecStartPre=/bin/chmod 660 /var/log/mailman/error
 ExecStart=/usr/lib/mailman/bin/mailmanctl -s start
 ExecReload=/usr/lib/mailman/bin/mailmanctl restart
-ExecStop=/usr/bin/mailman-update-cfg
+ExecStop=/usr/lib/mailman/bin/mailman-update-cfg
 ExecStop=/usr/lib/mailman/bin/mailmanctl stop
 ExecStop=/bin/sh -c 'echo -e "# DO NOT EDIT THIS FILE!\n#\n# Contents of this file managed by /etc/init.d/mailman\n# Master copy is /usr/lib/mailman/cron/crontab.in" > /etc/cron.d/mailman'
 Type=forking
diff --git a/mailman.spec b/mailman.spec
index 84cd9cc..85a6a30 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -4,7 +4,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.15
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 3
 Group: Applications/Internet
 Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -250,10 +250,10 @@ install -m755 -d %{buildroot}%{docdir}/admin
 cp -r %{mmbuilddir}/doc %{buildroot}%{docdir}/admin
 
 #install the script for updating the config (bz#484328)
-mkdir -p %{buildroot}%{_bindir}
-install -m755 %{SOURCE8} %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{mmdir}/bin/
+install -m755 %{SOURCE8} %{buildroot}%{mmdir}/bin/
 # set library path in mailman-update-cfg script.
-sed -i 's, at mmdir@,%{mmdir},g' %{buildroot}%{_bindir}/mailman-update-cfg
+sed -i 's, at mmdir@,%{mmdir},g' %{buildroot}%{mmdir}/bin/mailman-update-cfg
 
 # remove dir/files from %{buildroot} that we aren't shipping
 rm -rf %{buildroot}%{varmmdir}/icons
@@ -576,11 +576,14 @@ exit 0
 %attr(2775,root,%{mmgroup}) %{queuedir}
 %attr(0644,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/cron.d/mailman
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
-%attr(0755,root,root) %{_bindir}/mailman-update-cfg
+%attr(0755,root,root) %{mmdir}/bin/mailman-update-cfg
 %dir %attr(775,root,%{mmgroup}) %{piddir}
 %dir %attr(775,root,%{mmgroup}) %{lockdir}
 
 %changelog
+* Thu Apr 04 2013 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.15-13
+- move mailman-update-cfg to /usr/lib/mailman/bin
+
 * Tue Apr 02 2013 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.15-12
 - fix #947191 - change contentdir to /usr/share/httpd