From 468749ccbb877ba6319371efe91153fa144a7841 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Dec 01 2017 15:17:33 +0000 Subject: fix in vim-update.sh --- diff --git a/vim-update.sh b/vim-update.sh index e3aa783..68e27d3 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -10,6 +10,7 @@ branches_count=4 branches_index=0 release_index=0 regexp_index=0 +done_build=0 releases_regexp="${regexps[@]: regexp_index: 1}" let "regexp_index+=1" @@ -106,7 +107,7 @@ if [ $CHANGES -ne 0 ]; then if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then fedpkg build if [ $? -eq 0 ]; then - bodhi updates new --user zdohnal --type enhancement --notes "The newest upstream commit" --request testing --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1} + done_build=1 else echo "Error when building package in $branch" exit 1 @@ -152,7 +153,7 @@ if [ $CHANGES -ne 0 ]; then | grep $releases_regexp` testing_update=`bodhi updates query --packages vim --status testing \ | grep $releases_regexp` - if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then + if [ "$pending_update" == "" ] && [ "$testing_update" == "" ] && [ $done_build -eq 1 ]; then fedpkg build if [ $? -eq 0 ]; then if [ $branch != "master" ]; then @@ -162,6 +163,8 @@ if [ $CHANGES -ne 0 ]; then echo "Error when building package for $branch" exit 1 fi + else + done_build=0 fi # Increment index and cut the head of releases_regexp string diff --git a/vim.spec b/vim.spec index 51a048a..3a62acb 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: 1%{?dist} +Release: 2%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -766,6 +766,9 @@ update-desktop-database &> /dev/null ||: %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Dec 01 2017 Zdenek Dohnal - 8.0.1360-2 +- fix in vim-update.sh + * Fri Dec 01 2017 Karsten Hopp 8.0.1360-1 - patchlevel 1360