[mailman/f20: 11/12] Fix merge conflicts

[Jan Kaluža]

commit 360a783868e8a75fa1d64fcf8d9456fdc4857881
Merge: eaf3e83 e69eadb
Author: Jan Kaluza <jkaluza at redhat.com>
Date:   Thu May 22 08:27:32 2014 +0200

    Fix merge conflicts

 .gitignore                          |    4 +
 mailman-2.1-mailmanctl-status.patch |   86 +-----------------
 mailman-2.1.10-ctypefix.patch       |   15 ---
 mailman-2.1.11-cron.patch           |   99 +--------------------
 mailman-2.1.11-fhsinit.patch        |   39 --------
 mailman-2.1.11-footer.patch         |   13 ---
 mailman-2.1.12-init-not-on.patch    |   13 ---
 mailman-2.1.12-initcleanup.patch    |   65 -------------
 mailman-2.1.12-mmcfg.patch          |   19 ----
 mailman-2.1.13-env-python.patch     |   36 +-------
 mailman-2.1.15-check_perms.patch    |    6 +-
 mailman-2.1.9-ctypo-new.patch       |  169 -----------------------------------
 mailman-2.1.9-header-folding.patch  |  120 -------------------------
 mailman-2.1.9-selinux.patch         |   47 ----------
 mailman-python-compile.patch        |   13 ++--
 mailman.spec                        |   54 ++++++------
 sources                             |    2 +-
 17 files changed, 54 insertions(+), 746 deletions(-)
---
diff --cc mailman.spec
index d3ca8e2,ce80ff7..b39e0c6
--- a/mailman.spec
+++ b/mailman.spec
@@@ -586,12 -570,22 +570,28 @@@ exit 
  %dir %attr(775,root,%{mmgroup}) %{lockdir}
  
  %changelog
+ * Mon May 12 2014 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.18.1-1
+ - update to new upstream version 2.1.18-1 (#1089971)
+ 
+ * Thu Jan 02 2014 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.17-3
+ - fix #1043677 - fix setgid for /usr/lib/mailman/mail/mailman
+ 
+ * Wed Dec 18 2013 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.17-2
+ - fix #1043677 - fix setgid for cgi binaries
+ 
+ * Tue Dec 03 2013 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.17-1
+ - update to new upstream version 2.1.17 (#1034083)
+ - remove patches patching unused init script
+ 
+ * Fri Oct 18 2013 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.16-1
+ - update to new upstream version 2.1.16 (#984536)
+ 
 +* Fri Jan 03 2014 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.15-17
 +- fix #1043677 - fix setgid for /usr/lib/mailman/mail/mailman
 +
 +* Wed Dec 18 2013 Jan Kaluza <jkaluza at redhat.com> - 3:2.1.15-16
 +- fix #1043677 - fix setgid for cgi binaries
 +
  * Wed Jul 31 2013 Ville Skyttä <ville.skytta at iki.fi> - 3:2.1.15-15
  - Install docs to %%{_pkgdocdir} where available.