[mailman] update to new upstream version 2.1.18-1 (#1089971)
Jan Kaluža
jkaluza at fedoraproject.org
Mon May 12 12:05:23 UTC 2014
commit 914a7cc98fff9ad402619c77369dc47481b71046
Author: Jan Kaluza <jkaluza at redhat.com>
Date: Mon May 12 14:05:10 2014 +0200
update to new upstream version 2.1.18-1 (#1089971)
.gitignore | 1 +
mailman-2.1.11-cron.patch | 6 +++---
mailman-2.1.13-env-python.patch | 36 +++++-------------------------------
mailman.spec | 21 ++++++++++++++-------
sources | 2 +-
5 files changed, 24 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83fb780..addeb35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ mailman-2.1.13.tgz
/mailman-2.1.15.tgz
/mailman-2.1.16.tgz
/mailman-2.1.17.tgz
+/mailman-2.1.18.1.tgz
diff --git a/mailman-2.1.11-cron.patch b/mailman-2.1.11-cron.patch
index d729516..27c5ad5 100644
--- a/mailman-2.1.11-cron.patch
+++ b/mailman-2.1.11-cron.patch
@@ -101,7 +101,7 @@ index c66c09e..247c834 100755
# Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
#
diff --git a/cron/mailpasswds b/cron/mailpasswds
-index 5745265..4d0cd3a 100755
+index da64376..5d8d792 100755
--- a/cron/mailpasswds
+++ b/cron/mailpasswds
@@ -1,4 +1,4 @@
@@ -111,14 +111,14 @@ index 5745265..4d0cd3a 100755
# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
#
diff --git a/cron/nightly_gzip b/cron/nightly_gzip
-index 0a0f4e3..7dba3b1 100755
+index de493d0..8af0351 100755
--- a/cron/nightly_gzip
+++ b/cron/nightly_gzip
@@ -1,4 +1,4 @@
-#! @PYTHON@
+#! @PYTHON@ -S
#
- # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
#
diff --git a/cron/senddigests b/cron/senddigests
index edf27a2..c64adc1 100755
diff --git a/mailman-2.1.13-env-python.patch b/mailman-2.1.13-env-python.patch
index a34d461..efbcb4b 100644
--- a/mailman-2.1.13-env-python.patch
+++ b/mailman-2.1.13-env-python.patch
@@ -1,36 +1,10 @@
-diff -up mailman-2.1.13/bin/msgfmt.py.env mailman-2.1.9/bin/msgfmt.py
---- mailman-2.1.13/bin/msgfmt.py.env 2010-04-13 17:01:16.000000000 +0200
-+++ mailman-2.1.13/bin/msgfmt.py 2010-04-13 17:01:22.000000000 +0200
+diff --git a/tests/onebounce.py b/tests/onebounce.py
+index 846c4fa..85f3b98 100755
+--- a/tests/onebounce.py
++++ b/tests/onebounce.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python
- # -*- coding: iso-8859-1 -*-
- # Written by Martin v. Löwis <loewis at informatik.hu-berlin.de>
-diff -up mailman-2.1.13/Mailman/Archiver/pipermail.py.env mailman-2.1.9/Mailman/Archiver/pipermail.py
---- mailman-2.1.13/Mailman/Archiver/pipermail.py.env 2010-04-13 17:00:31.000000000 +0200
-+++ mailman-2.1.13/Mailman/Archiver/pipermail.py 2010-04-13 17:00:38.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/python
-
- from __future__ import nested_scopes
-
-diff -up mailman-2.1.13/Mailman/Post.py.env mailman-2.1.9/Mailman/Post.py
---- mailman-2.1.13/Mailman/Post.py.env 2010-04-13 16:59:59.000000000 +0200
-+++ mailman-2.1.13/Mailman/Post.py 2010-04-13 17:00:06.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/python
- #
- # Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
- #
-diff -up mailman-2.1.13/tests/onebounce.py.env mailman-2.1.9/tests/onebounce.py
---- mailman-2.1.13/tests/onebounce.py.env 2010-04-13 17:01:47.000000000 +0200
-+++ mailman-2.1.13/tests/onebounce.py 2010-04-13 17:01:52.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/python
-
- # Copyright (C) 2002 by the Free Software Foundation, Inc.
+ # Copyright (C) 2002-2013 by the Free Software Foundation, Inc.
#
diff --git a/mailman.spec b/mailman.spec
index 1305a61..59d8a7f 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -3,12 +3,15 @@
Summary: Mailing list manager with built in Web access
Name: mailman
-Version: 2.1.17
-Release: 3%{?dist}
+# Some versions contain dash, so we replace dash by dot in Version,
+# but keep the original state in "real_version".
+Version: 2.1.18.1
+%global real_version 2.1.18-1
+Release: 1%{?dist}
Epoch: 3
Group: Applications/Internet
-Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
-#Source0: http://prdownloads.sourceforge.net/mailman/mailman-%{version}.tgz
+Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{real_version}.tgz
+#Source0: http://prdownloads.sourceforge.net/mailman/mailman-%{real_version}.tgz
Source1: mm_cfg.py
Source3: httpd-mailman.conf
Source4: mailman.logrotate
@@ -41,6 +44,7 @@ Requires(postun): systemd
BuildRequires: automake
BuildRequires: python-devel
BuildRequires: systemd-units
+BuildRequires: python-dns
%global contentdir /usr/share/httpd
@@ -51,7 +55,7 @@ BuildRequires: systemd-units
# see rhbz#226117 for more information
%global mmdir /usr/lib/%{name}
%global varmmdir /var/lib/%{name}
-%global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+%global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{real_version}}
%global configdir /etc/%{name}
%global datadir %{varmmdir}/data
%global archivesdir %{varmmdir}/archives
@@ -62,7 +66,7 @@ BuildRequires: systemd-units
%global templatedir %{configdir}/templates
%global httpdconfdir /etc/httpd/conf.d
%global restart_flag /var/run/%{name}-restart-after-rpm-install
-%global mmbuilddir %{_builddir}/%{name}-%{version}
+%global mmbuilddir %{_builddir}/%{name}-%{real_version}
%global httpdconffile %{name}.conf
# Now, the user and group the CGIs will expect to be run under. This should
@@ -104,7 +108,7 @@ additional installation steps, these are described in:
%{docdir}/INSTALL.REDHAT
%prep
-%setup -q
+%setup -q -n mailman-%{real_version}
%patch1 -p1 -b .multimail
%patch2 -p1 -b .permissions
%patch3 -p1 -b .status
@@ -567,6 +571,9 @@ exit 0
%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
diff --git a/sources b/sources
index c0d5a4d..c27bc57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39043257f91eb876082fa90470aa8d28 mailman-2.1.17.tgz
+e1b50f28cf2446e1013d0e1c12933a37 mailman-2.1.18.1.tgz
More information about the scm-commits
mailing list