[msmtp] Ver. 1.4.31

[Peter Lemenkov]

commit 74388ef8c6ed6eb65d1ff1087444cb1a99d176f1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Sep 2 10:17:41 2013 +0400

    Ver. 1.4.31
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore |    1 +
 msmtp.spec |   20 +++++++++++++++-----
 sources    |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac27515..9dd48cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ msmtp-1.4.19.tar.bz2
 /msmtp-1.4.23.tar.bz2
 /msmtp-1.4.27.tar.bz2
 /msmtp-1.4.29.tar.bz2
+/msmtp-1.4.31.tar.bz2
diff --git a/msmtp.spec b/msmtp.spec
index cc430c3..ec4dba5 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,6 +1,6 @@
 Name:           msmtp
-Version:        1.4.29
-Release:        3%{?dist}
+Version:        1.4.31
+Release:        1%{?dist}
 Summary:        SMTP client
 Group:          System Environment/Base
 License:        GPLv3+
@@ -8,11 +8,19 @@ URL:            http://msmtp.sourceforge.net
 Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?el5}
+BuildRequires:  openssl-devel
+%else
 BuildRequires:  gnutls-devel
+%endif
 BuildRequires:  libidn-devel
 BuildRequires:  gettext
 BuildRequires:  libgsasl-devel
+%if 0%{?el5}%{?el6}
+BuildRequires:  gnome-keyring-devel
+%else
 BuildRequires:  libgnome-keyring-devel
+%endif
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -35,7 +43,7 @@ Features include:
 %setup -q
 
 %build
-%configure --disable-rpath --with-gnome-keyring
+%configure --disable-rpath --with-gnome-keyring %{?el5:--with-ssl=openssl}
 make %{?_smp_mflags}
 
 
@@ -59,7 +67,6 @@ fi
 rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS scripts
 %doc doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
 %{_bindir}/%{name}
@@ -68,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 02 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.4.31-1
+- Ver. 1.4.31
+
 * Thu Aug  1 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.4.29-3
 - Fix build with unversioned %%{_docdir_fmt}.
 
@@ -126,7 +136,7 @@ rm -rf %{buildroot}
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.13-4
 - Autorebuild for GCC 4.3
 
-* Thu Aug 29 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.13-3
+* Wed Aug 29 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.13-3
 - rebuild for ppc32 selinux fix
 
 * Thu Aug 2 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.13-2
diff --git a/sources b/sources
index ec82154..f5b0645 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87cc6f37cb7a163ceb89382932e41535  msmtp-1.4.29.tar.bz2
+792ac0ffa30dc95ea1889a548128186d  msmtp-1.4.31.tar.bz2