diff --git a/vim-update.sh b/vim-update.sh index 80fc13d..041e05a 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -13,7 +13,13 @@ if [ "x$1" == "x--force" ]; then fi 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` ORIGPL=`grep "define patchlevel" vim.spec | cut -d ' ' -f 3 | sed -e "s/^0*//g"` ORIGPLFILLED=`printf "%03d" $ORIGPL` @@ -61,12 +67,13 @@ if [ $CHANGES -ne 0 ]; then $debug fedpkg new-sources vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2 $debug git add vim.spec README.patches $debug git commit -m "- patchlevel $LASTPL" - $debug git push - if [ $? -eq 0 ]; then - $debug rm -f $HOME/.koji/config - $debug fedpkg build - $debug ln -sf ppc-config $HOME/.koji/config - else - echo "GIT push failed" - fi + $debug fedpkg mockbuild + #$debug git push + #if [ $? -eq 0 ]; then + # $debug rm -f $HOME/.koji/config + # $debug fedpkg build + # $debug ln -sf ppc-config $HOME/.koji/config + #else + # echo "GIT push failed" + #fi fi diff --git a/vim.spec b/vim.spec index 20565cc..742dda5 100644 --- a/vim.spec +++ b/vim.spec @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -765,6 +765,9 @@ rm -rf %{buildroot} %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Aug 09 2017 Zdenek Dohnal 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 8.0.891-1 - patchlevel 891