From e4a268398861008ddaff42e742e8fa04e7783963 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Sep 22 2015 09:49:50 +0000 Subject: add Provides: mergetool for bugzilla #990444 --- diff --git a/vim.spec b/vim.spec index 6642f73..2ac2226 100644 --- a/vim.spec +++ b/vim.spec @@ -1012,6 +1012,7 @@ Summary: A version of the VIM editor which includes recent enhancements Group: Applications/Editors Requires: vim-common = %{epoch}:%{version}-%{release} which Provides: vim = %{version}-%{release} +Provides: mergetool Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description enhanced @@ -1040,6 +1041,7 @@ Summary: The VIM version of the vi editor for the X Window System Group: Applications/Editors Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk2 >= 2.6 Provides: gvim = %{version}-%{release} +Provides: mergetool BuildRequires: gtk2-devel libSM-devel libXt-devel libXpm-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: hicolor-icon-theme @@ -2502,6 +2504,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Sep 22 2015 Karsten Hopp 7.4.873-1 +- add Provides: mergetool for bugzilla #990444 + * Fri Sep 18 2015 Karsten Hopp 7.4.873-1 - patchlevel 873