Accepting request 172479 from server:mail

- we dont use the unversion path anymore for installing the
  extension: use requires_eq for requiring vim.

- /usr/share/vim/current is a symlink, resolve it before putting
  any file under there.

OBS-URL: https://build.opensuse.org/request/show/172479
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/msmtp?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2013-04-20 15:49:34 +00:00 committed by Git OBS Bridge
commit b68313ffa5
2 changed files with 21 additions and 9 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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
- /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 Sat Oct 20 15:37:38 UTC 2012 - benoit.monin@gmx.fr
@ -15,7 +27,7 @@ Tue Jun 5 15:12:56 UTC 2012 - puzel@suse.com
- Bug fix: expand tilde for the aliases command. - 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: - update to version 1.4.27:
- No significant changes. - No significant changes.

View File

@ -1,7 +1,7 @@
# #
# spec file for package msmtp # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -33,16 +33,16 @@ BuildRequires: libgsasl-devel
# for the directory # for the directory
%if 0%{?centos_version} %if 0%{?centos_version}
BuildRequires: vim-common BuildRequires: vim-common
Requires: vim-common %requires_eq vim-common
%else %else
%if 0%{?suse_version} < 1030 %if 0%{?suse_version} < 1030
# old openSUSE and SLES and Fedora and RHEL: # old openSUSE and SLES and Fedora and RHEL:
BuildRequires: vim BuildRequires: vim
Requires: vim %requires_eq vim
%else %else
# recent openSUSE: # recent openSUSE:
BuildRequires: vim-base BuildRequires: vim-base
Requires: vim-base %requires_eq vim-base
%endif #suse_version %endif #suse_version
%endif #centos_version %endif #centos_version
%if 0%{?suse_version} %if 0%{?suse_version}
@ -122,9 +122,9 @@ install -m 0755 \
scripts/set_sendmail/*.sh \ scripts/set_sendmail/*.sh \
scripts/find_alias/*.sh \ scripts/find_alias/*.sh \
%{buildroot}%{_bindir} %{buildroot}%{_bindir}
install -D -m 0644 \
scripts/vim/msmtp.vim \ vimver=`readlink %{_datadir}/vim/current`
%{buildroot}%{_datadir}/vim/current/syntax/msmtp.vim install -D -m 0644 scripts/vim/msmtp.vim %{buildroot}/%{_datadir}/vim/$vimver/syntax/msmtp.vim
# main package doc files # main package doc files
for f in \ for f in \
@ -186,7 +186,7 @@ rm -f "%{buildroot}%{_infodir}/dir"
%{_bindir}/msmtp-gnome-tool.py %{_bindir}/msmtp-gnome-tool.py
%{_mandir}/man1/msmtp.1%{ext_man} %{_mandir}/man1/msmtp.1%{ext_man}
%{_infodir}/msmtp.info%{ext_info} %{_infodir}/msmtp.info%{ext_info}
%{_datadir}/vim/current/syntax/msmtp.vim %{_datadir}/vim/*/syntax/msmtp.vim
%files doc -f docfiles.lst %files doc -f docfiles.lst
%defattr (-, root, root) %defattr (-, root, root)