Merge branch 'f26' into f27
This commit is contained in:
commit
3ee5d45afb
@ -98,7 +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}
|
||||
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
|
||||
@ -140,8 +140,8 @@ if [ $CHANGES -ne 0 ]; then
|
||||
if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; 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}
|
||||
if [ $branch != "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}
|
||||
fi
|
||||
else
|
||||
echo "Error when building package for $branch"
|
||||
|
5
vim.spec
5
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
|
||||
@ -774,6 +774,9 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/icons/locolor/*/apps/*
|
||||
|
||||
%changelog
|
||||
* Wed Sep 20 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1129-2
|
||||
- vim-update.sh - update was in bad form
|
||||
|
||||
* Wed Sep 20 2017 Karsten Hopp <karsten@redhat.com> 8.0.1129-1
|
||||
- patchlevel 1129
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user