diff --git a/vim-update.sh b/vim-update.sh index dc3a892..c0854a9 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -37,6 +37,8 @@ fi MAJORVERSION=`grep "define baseversion" vim.spec | cut -d ' ' -f 3` MAJORVERDIR=$(echo $MAJORVERSION | sed -e 's/\.//') +EPOCH=`grep "Epoch:" vim.spec | cut -d ':' -f 2` +PACKAGER=`rpmdev-packager` ORIGPL=`grep "define patchlevel" vim.spec | cut -d ' ' -f 3 | sed -e "s/^0*//g"` ORIGPLFILLED=`printf "%03d" $ORIGPL` @@ -76,7 +78,7 @@ cp -f vim-upstream/dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2 . #wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/ftplugin/spec.vim -O ftplugin-spec.vim #wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/syntax/spec.vim -O syntax-spec.vim if [ $CHANGES -ne 0 ]; then - CHLOG="* $DATE Karsten Hopp $UPSTREAMMAJOR" + CHLOG="* $DATE $PACKAGER - $EPOCH:$UPSTREAMMAJOR" $debug sed -i -e "/Release: /cRelease: 1%{?dist}" $SPEC if [ "x$MAJORVERSION" != "x$UPSTREAMMAJOR" ]; then $debug sed -i -s "s/define baseversion $MAJORVERSION/define baseversion $UPSTREAMMAJOR/" $SPEC diff --git a/vim.spec b/vim.spec index 324b4e8..ee4d1d9 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 7%{?dist} +Release: 8%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -772,6 +772,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jul 11 2018 Zdenek Dohnal - 2:8.1.119-8 +- add packager and epoch into update script to have better changelog + * Wed Jul 11 2018 Zdenek Dohnal - 2:8.1.119-7 - use %%{__python3} macro for defining shebang in python3 tests