Merge branch 'f25' into f26

vim-update.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 debug=""
 #debug="echo "
-releases=( "f25" "f26" "f27" "master" )
+branches=( "f25" "f26" "f27" "master" )
-releases_index=0
+releases=( "fc25" "fc26" "fc27" "fc28" )
+branches_index=0
 
 cd `dirname $0`
 LANG=C
@@ -15,7 +16,7 @@ if [ "x$1" == "x--force" ]; then
 fi
 
 DATE=`date +"%a %b %d %Y"`
-fedpkg switch-branch "${releases[@]: $releases_index: 1}"
+fedpkg switch-branch "${branches[@]: $branches_index: 1}"
 
 
 if [ $? -ne 0 ]; then
@@ -70,38 +71,58 @@ 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" 
+   # mockbuild
    $debug fedpkg mockbuild
    if [ $? -ne 0 ]; then
      echo "Error: fedpkg mockbuild"
      exit 1
    fi
+   # push
    $debug fedpkg push
    if [ $? -eq 0 ]; then
-     for release in "${releases[@]:(1)}";
+     echo "Error: fedpkg push"
-     do
-       $debug fedpkg switch-branch $release
-       $debug bash -c "git merge ${releases[@]: $release_index: 1} <<<':x'"
-       if [ $? -ne 0 ]; then
-         echo "Error: git merge ${releases[@]: $release_index: 1}"
      exit 1
    fi
-       let "release_index+=1"
+   # Check if release has pending or testing update - if not, build package
+   pending_update=`bodhi updates query --packages vim --status pending \
+     | grep "${releases[@]: $branches_index: 1}"`
+   testing_update=`bodhi updates query --packages vim --status testing \
+     | grep "${releases[@]: $branches_index: 1}"`
+   if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then
+     fedpkg build --nowait
+   fi
+   for branch in "${branches[@]:(1)}";
+   do
+     # switch to branch
+     $debug fedpkg switch-branch $branch
+     # merge with previous branch
+     $debug bash -c "git merge ${branches[@]: $branches_index: 1} <<<':x'"
+     if [ $? -ne 0 ]; then
+       echo "Error: git merge ${branches[@]: $branches_index: 1}"
+       exit 1
+     fi
+     # mockbuild
      $debug fedpkg mockbuild
      if [ $? -ne 0 ]; then
        echo "Error: fedpkg mockbuild failed"
        exit 1
      fi
+     # push
      $debug fedpkg push
      if [ $? -ne 0 ]; then
        echo "Error: fedpkg push"
        exit 1
      fi
-     done
+     # Check if release has pending or testing update - if not, build package
-   else
+     pending_update=`bodhi updates query --packages vim --status pending \
-     echo "Error: fedpkg push"
+       | grep "${releases[@]: $branches_index: 1}"`
-     exit 1
+     testing_update=`bodhi updates query --packages vim --status testing \
+       | grep "${releases[@]: $branches_index: 1}"`
+     if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then
+       fedpkg build --nowait
      fi
-
+     let "branches_index+=1"
+   done
    #$debug git push
    #if [ $? -eq 0 ]; then
    #   $debug rm -f $HOME/.koji/config

vim.spec

@@ -104,6 +104,8 @@ Group: Applications/Editors
 Conflicts: man-pages-fr < 0.9.7-14
 Conflicts: man-pages-it < 0.3.0-17
 Conflicts: man-pages-pl < 0.24-2
+# Because of conflicting man pages
+Conflicts: %{name}-minimal < %{version}-%{release}
 Requires: %{name}-filesystem
 
 %description common
@@ -129,6 +131,8 @@ many different languages.
 %package minimal
 Summary: A minimal version of the VIM editor
 Group: Applications/Editors
+# Because of conflicting manpages
+Conflicts: %{name}-common < %{version}-%{release}
 Provides: vi = %{version}-%{release}
 Provides: /bin/vi
 
@@ -771,7 +775,9 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Sep 11 2017 Karsten Hopp <karsten@redhat.com> 8.0.1092-1
+- editing vim-update.sh for building package
 - patchlevel 1092
+- 1487175 - VIm conflicts in man pages
 
 * Fri Sep 08 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1071-2
 - fixing merge and push in vim-update.sh