From fc753b511c893c6e77991fbfbcdc98ee33dddc3fcdcc1c6f4bf0c6b1b2281e3c Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 30 Jan 2014 17:12:55 +0000
Subject: [PATCH] Accepting request 213796 from
 home:benoit_monin:branches:server:mail

- update to version 1.4.31
- rework the path lookup for the vim syntax file: fix fedora and redhat build

OBS-URL: https://build.opensuse.org/request/show/213796
OBS-URL: https://build.opensuse.org/package/show/server:mail/msmtp?expand=0&rev=61
---
 msmtp-1.4.28.tar.bz2 |  3 ---
 msmtp-1.4.31.tar.bz2 |  3 +++
 msmtp.changes        | 23 +++++++++++++++++++++++
 msmtp.spec           | 14 ++++++++++----
 4 files changed, 36 insertions(+), 7 deletions(-)
 delete mode 100644 msmtp-1.4.28.tar.bz2
 create mode 100644 msmtp-1.4.31.tar.bz2

diff --git a/msmtp-1.4.28.tar.bz2 b/msmtp-1.4.28.tar.bz2
deleted file mode 100644
index 11c2a44..0000000
--- a/msmtp-1.4.28.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de0e7de6e73cce4a0df57bd831677ac0e2b82f6395314b6c508c9d2d18cdc52a
-size 302778
diff --git a/msmtp-1.4.31.tar.bz2 b/msmtp-1.4.31.tar.bz2
new file mode 100644
index 0000000..0cb1247
--- /dev/null
+++ b/msmtp-1.4.31.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:247af9a95fa22f506e85109fc4268a5d91ca03af9b17eebcc1e46b7cd64c225f
+size 305770
diff --git a/msmtp.changes b/msmtp.changes
index 674b9f3..a706058 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Jan 13 20:49:38 UTC 2014 - benoit.monin@gmx.fr
+
+- rework the path lookup for the vim syntax file: fix fedora and
+  redhat build
+
+-------------------------------------------------------------------
+Sun Dec 29 14:13:09 UTC 2013 - benoit.monin@gmx.fr
+
+- update to version 1.4.31:
+  * Updated the msmtpq script.
+  * Fixed building of the documentation with texinfo >= 5.0.
+- additional changes from version 1.4.30:
+  * Fix a bug in msmtp_read_addresses() that was introduced in
+    version 1.4.29 by fixing a problem in the wrong way.
+- additional changes from version 1.4.29:
+  * Fix bugs in msmtp_read_addresses(), including a crash.
+  * Removed autotools files that are automatically copied by
+    'autoreconf -i' from repository.
+  * Properly require an argument to --passwordeval. Fixes a crash
+    when none is given.
+  * Replace old service name "ssmtp" with current one: "smtps".
+
 -------------------------------------------------------------------
 Wed Nov 20 14:46:40 CET 2013 - tbehrens@suse.com
 
diff --git a/msmtp.spec b/msmtp.spec
index dd08e93..ebacc5e 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package msmtp
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %bcond_with gnome_keyring
 
 Name:           msmtp
-Version:        1.4.28
+Version:        1.4.31
 Release:        0
 BuildRequires:  libidn-devel
 BuildRequires:  openssl-devel
@@ -123,8 +123,14 @@ install -m 0755 \
         scripts/find_alias/*.sh \
     %{buildroot}%{_bindir}
 
-vimver=`readlink %{_datadir}/vim/current`
-install -D -m 0644 scripts/vim/msmtp.vim %{buildroot}/%{_datadir}/vim/$vimver/syntax/msmtp.vim
+# find where to install vim syntax
+# start with the "site" directory, then "current" and finally any "vim??"
+for vimsyntax in %{_datadir}/vim/{site,current,vim[0-9][0-9]}/syntax; do
+    if [ -d $vimsyntax ]; then
+        break
+    fi
+done
+install -D -m 0644 scripts/vim/msmtp.vim %{buildroot}$vimsyntax/msmtp.vim
 
 # main package doc files
 for f in \