From b19ed8dd9a0db4a813abe7939c29623b0f54e8f28a45762373a91cc560cdcced Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 19 Apr 2013 10:58:14 +0000 Subject: [PATCH 1/2] Accepting request 171269 from home:namtrac:branches:server:mail - /usr/share/vim/current is a symlink, resolve it before putting any file under there. OBS-URL: https://build.opensuse.org/request/show/171269 OBS-URL: https://build.opensuse.org/package/show/server:mail/msmtp?expand=0&rev=56 --- msmtp.changes | 6 ++++++ msmtp.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/msmtp.changes b/msmtp.changes index 5484c15..959e8e4 100644 --- a/msmtp.changes +++ b/msmtp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 17 11:57:50 UTC 2013 - idonmez@suse.com + +- /usr/share/vim/current is a symlink, resolve it before putting + any file under there. + ------------------------------------------------------------------- Sat Oct 20 15:37:38 UTC 2012 - benoit.monin@gmx.fr diff --git a/msmtp.spec b/msmtp.spec index c1fab39..73a6b29 100644 --- a/msmtp.spec +++ b/msmtp.spec @@ -1,7 +1,7 @@ # # spec file for package msmtp # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -122,9 +122,9 @@ install -m 0755 \ scripts/set_sendmail/*.sh \ scripts/find_alias/*.sh \ %{buildroot}%{_bindir} -install -D -m 0644 \ - scripts/vim/msmtp.vim \ - %{buildroot}%{_datadir}/vim/current/syntax/msmtp.vim + +vimver=`readlink %{_datadir}/vim/current` +install -D -m 0644 scripts/vim/msmtp.vim %{buildroot}/%{_datadir}/vim/$vimver/syntax/msmtp.vim # main package doc files for f in \ @@ -186,7 +186,7 @@ rm -f "%{buildroot}%{_infodir}/dir" %{_bindir}/msmtp-gnome-tool.py %{_mandir}/man1/msmtp.1%{ext_man} %{_infodir}/msmtp.info%{ext_info} -%{_datadir}/vim/current/syntax/msmtp.vim +%{_datadir}/vim/*/syntax/msmtp.vim %files doc -f docfiles.lst %defattr (-, root, root) From 3ec5e56d51ae6cbfb27b7d706007940f322e847ee3fc581666be0c686fb101b8 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 19 Apr 2013 12:47:15 +0000 Subject: [PATCH 2/2] - we dont use the unversion path anymore for installing the extension: use requires_eq for requiring vim. OBS-URL: https://build.opensuse.org/package/show/server:mail/msmtp?expand=0&rev=57 --- msmtp.changes | 8 +++++++- msmtp.spec | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/msmtp.changes b/msmtp.changes index 959e8e4..ad0b2d0 100644 --- a/msmtp.changes +++ b/msmtp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 19 12:46:40 UTC 2013 - mrueckert@suse.de + +- we dont use the unversion path anymore for installing the + extension: use requires_eq for requiring vim. + ------------------------------------------------------------------- Wed Apr 17 11:57:50 UTC 2013 - idonmez@suse.com @@ -21,7 +27,7 @@ Tue Jun 5 15:12:56 UTC 2012 - puzel@suse.com - Bug fix: expand tilde for the aliases command. ------------------------------------------------------------------- -Tue Jan 10 11:09:26 UTC 2012 - mrueckert@suse.com +Tue Jan 10 11:09:26 UTC 2012 - mrueckert@suse.de - update to version 1.4.27: - No significant changes. diff --git a/msmtp.spec b/msmtp.spec index 73a6b29..0f1cf31 100644 --- a/msmtp.spec +++ b/msmtp.spec @@ -33,16 +33,16 @@ BuildRequires: libgsasl-devel # for the directory %if 0%{?centos_version} BuildRequires: vim-common -Requires: vim-common +%requires_eq vim-common %else %if 0%{?suse_version} < 1030 # old openSUSE and SLES and Fedora and RHEL: BuildRequires: vim -Requires: vim +%requires_eq vim %else # recent openSUSE: BuildRequires: vim-base -Requires: vim-base +%requires_eq vim-base %endif #suse_version %endif #centos_version %if 0%{?suse_version}