diff --git a/vim-7.3-spec-epoch.patch b/vim-7.3-spec-epoch.patch new file mode 100644 index 0000000..8305de7 --- /dev/null +++ b/vim-7.3-spec-epoch.patch @@ -0,0 +1,18 @@ +42a43 +> let epoch = "" +46a48 +> let epochline = -1 +53a56,58 +> elseif (epoch == "" && linestr =~? '^Epoch:') +> let epochline = line +> let epoch = substitute(strpart(linestr,6), '^[ ]*\([^ ]\+\)[ ]*$','\1','') +69a75 +> let epoch = s:ParseRpmVars(epoch, epochline) +92c98,102 +< let release_info = ver."-".rel +--- +> if (epoch == "") +> let release_info = ver."-".rel +> else +> let release_info = epoch.":".ver."-".rel +> endif diff --git a/vim.spec b/vim.spec index a3ff7d0..6d569b2 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{beta}%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 @@ -689,6 +689,7 @@ Patch3007: vim-7.0-syncolor.patch Patch3008: vim-7.0-specedit.patch Patch3009: vim72-rh514717.patch Patch3010: vim-7.3-bug816848.patch +Patch3011: vim-7.3-spec-epoch.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel ncurses-devel gettext perl-devel @@ -1462,6 +1463,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3008 -p1 %patch3009 -p1 %patch3010 -p1 +%patch3011 -p1 %build cp -f %{SOURCE5} . @@ -1899,6 +1901,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Aug 06 2012 Karsten Hopp 2:7.3.622-2 +- add epoch to spec.vim and automatic changelog entries + * Mon Aug 06 2012 Karsten Hopp 7.3.622-1 - patchlevel 622