editing vim-update.sh - now it takes branch name as argument for switching and run mockbuild

This commit is contained in:
Zdenek Dohnal 2017-08-09 09:33:35 +02:00
parent d1d1c66e5e
commit b26d6993fa
2 changed files with 20 additions and 10 deletions

View File

@ -13,7 +13,13 @@ if [ "x$1" == "x--force" ]; then
fi fi
DATE=`date +"%a %b %d %Y"` DATE=`date +"%a %b %d %Y"`
fedpkg switch-branch master fedpkg switch-branch $1
if [ $? -ne 0 ]; then
echo "Error with switching branch"
exit 1
fi
MAJORVERSION=`grep "define baseversion" vim.spec | cut -d ' ' -f 3` MAJORVERSION=`grep "define baseversion" vim.spec | cut -d ' ' -f 3`
ORIGPL=`grep "define patchlevel" vim.spec | cut -d ' ' -f 3 | sed -e "s/^0*//g"` ORIGPL=`grep "define patchlevel" vim.spec | cut -d ' ' -f 3 | sed -e "s/^0*//g"`
ORIGPLFILLED=`printf "%03d" $ORIGPL` ORIGPLFILLED=`printf "%03d" $ORIGPL`
@ -61,12 +67,13 @@ if [ $CHANGES -ne 0 ]; then
$debug fedpkg new-sources vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2 $debug fedpkg new-sources vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2
$debug git add vim.spec README.patches $debug git add vim.spec README.patches
$debug git commit -m "- patchlevel $LASTPL" $debug git commit -m "- patchlevel $LASTPL"
$debug git push $debug fedpkg mockbuild
if [ $? -eq 0 ]; then #$debug git push
$debug rm -f $HOME/.koji/config #if [ $? -eq 0 ]; then
$debug fedpkg build # $debug rm -f $HOME/.koji/config
$debug ln -sf ppc-config $HOME/.koji/config # $debug fedpkg build
else # $debug ln -sf ppc-config $HOME/.koji/config
echo "GIT push failed" #else
fi # echo "GIT push failed"
#fi
fi fi

View File

@ -21,7 +21,7 @@ Summary: The VIM editor
URL: http://www.vim.org/ URL: http://www.vim.org/
Name: vim Name: vim
Version: %{baseversion}.%{patchlevel} Version: %{baseversion}.%{patchlevel}
Release: 1%{?dist} Release: 2%{?dist}
License: Vim License: Vim
Group: Applications/Editors Group: Applications/Editors
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@ -765,6 +765,9 @@ rm -rf %{buildroot}
%{_datadir}/icons/locolor/*/apps/* %{_datadir}/icons/locolor/*/apps/*
%changelog %changelog
* Wed Aug 09 2017 Zdenek Dohnal <zdohnal@redhat.com> 8.0.891-2
- editing vim-update.sh - now it takes branch name as argument for switching and run mockbuild
* Tue Aug 08 2017 Karsten Hopp <karsten@redhat.com> 8.0.891-1 * Tue Aug 08 2017 Karsten Hopp <karsten@redhat.com> 8.0.891-1
- patchlevel 891 - patchlevel 891