Merge branch 'f26' into f27

This commit is contained in:
Zdenek Dohnal 2017-09-20 12:10:07 +02:00
commit d743bd3040
2 changed files with 9 additions and 11 deletions

View File

@ -98,11 +98,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}
let "release_index+=1"
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}
else
echo "Error when building package in $branch"
exit 1
@ -111,6 +107,8 @@ if [ $CHANGES -ne 0 ]; then
echo "There are pending/testing updates, do not build package."
fi
let "release_index+=1"
for branch in "${branches[@]:(1)}";
do
# switch to branch
@ -143,11 +141,7 @@ if [ $CHANGES -ne 0 ]; then
fedpkg build
if [ $? -eq 0 ]; then
if [ ${branches[@]: $branches_index: 1} != "master" ]; 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}
let "release_index+=1"
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}
fi
else
echo "Error when building package for $branch"
@ -157,6 +151,7 @@ if [ $CHANGES -ne 0 ]; then
# Increment index and cut the head of releases_regexp string
let "branches_index+=1"
let "release_index+=1"
releases_regexp=${releases_regexp#*|}
done
#$debug git push

View File

@ -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
@ -774,6 +774,9 @@ rm -rf %{buildroot}
%{_datadir}/icons/locolor/*/apps/*
%changelog
* Wed Sep 20 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1127-2
- vim-update.sh - update script tried to push for previous version
* Tue Sep 19 2017 Karsten Hopp <karsten@redhat.com> 8.0.1127-1
- patchlevel 1127