[mailx/f13/master] update to 12.5

[Dmitry Butskoy]

commit 0d461a59161e2f6e988e9580917b708e51ff1e0c
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Tue Oct 26 17:14:48 2010 +0400

    update to 12.5

 mailx-12.4-openssl.patch |  170 ----------------------------------------------
 mailx.spec               |   38 +++++++++--
 sources                  |    2 +-
 3 files changed, 33 insertions(+), 177 deletions(-)
---
diff --git a/mailx.spec b/mailx.spec
index 63a4935..f57ab12 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -3,18 +3,38 @@
 
 Summary: Enhanced implementation of the mailx command
 Name: mailx
-Version: 12.4
-Release: 6%{?dist}
+Version: 12.5
+Release: 1%{?dist}
 Group: 	Applications/Internet
 # mailx-12.4/nsserr.c, mailx-12.4/nss.c  have MPLv1.1 license 
 # other files are BSD 
 License: BSD with advertising and MPLv1.1
 URL: http://heirloom.sourceforge.net/mailx.html
-Source0: http://downloads.sourceforge.net/heirloom/mailx-%{version}.tar.bz2
+
+#Source0: http://downloads.sourceforge.net/heirloom/mailx-%{version}.tar.bz2
+#
+#   Mailx's upstream now provides only the CVS method of downloading,
+# even for the stable releases.
+#   Use:
+#
+#   $ cvs -d:pserver:anonymous at nail.cvs.sourceforge.net:/cvsroot/nail login
+#   CVS password:<just type return>
+#   $ cvs -d:pserver:anonymous at nail.cvs.sourceforge.net:/cvsroot/nail co nail
+#
+# to download the source, then
+#
+#   $ ver=`( cat nail/version.c; echo V ) | gcc -E - | tail -1`
+#   $ ver=`eval echo $ver`
+#   $ mv nail mailx-$ver
+#   $ tar -cvf - mailx-$ver | bzip2 -9 >mailx-$ver.tar.bz2
+#
+# to provide the source tarball in the usual way.
+#
+Source0: mailx-%{version}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: nail-11.25-config.patch
 Patch1: mailx-12.3-pager.patch
-Patch2: mailx-12.4-openssl.patch
 
 %if %{use_nss}
 BuildRequires: nss-devel, pkgconfig, krb5-devel
@@ -49,9 +69,8 @@ as well as "nail" (the initial name of this project).
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
-sed -i 's,/etc/nail.rc,%{mailrc},g' mailx.1 mailx.1.html
+sed -i 's,/etc/nail.rc,%{mailrc},g' mailx.1
 
 
 %build
@@ -134,6 +153,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 26 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.5-1
+- update to 12.5
+- drop patches applied upstream
+
+* Fri Oct  1 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 12.4-7
+- fix the typo in man-page
+
 * Mon Dec 21 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12.4-6
 - fix source tag
 
diff --git a/sources b/sources
index 41257bd..c3659b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c93759e34200eb56a0e7c464680a54a  mailx-12.4.tar.bz2
+acea6f7e8ae727514e498bd8c1895363  mailx-12.5.tar.bz2