[arch-commits] Commit in fossil/trunk (3 files)

[Anatol Pomozov]

    Date: Monday, February 23, 2015 @ 20:11:27
  Author: anatolik
Revision: 128145

upgpkg: fossil 1.31-1

Modified:
  fossil/trunk/PKGBUILD
Deleted:
  fossil/trunk/fossil-autocomplete.bash
  fossil/trunk/fossil-autocomplete.zsh

--------------------------+
 PKGBUILD                 |   27 +++++++++------------------
 fossil-autocomplete.bash |   33 ---------------------------------
 fossil-autocomplete.zsh  |   30 ------------------------------
 3 files changed, 9 insertions(+), 81 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-23 19:10:12 UTC (rev 128144)
+++ PKGBUILD	2015-02-23 19:11:27 UTC (rev 128145)
@@ -4,10 +4,10 @@
 # Contributor: Konstantin Plotnikov <kostyapl at gmail dot com>
 
 pkgname=fossil
-pkgver=1.30
-_date_pkgver=20150119112900
+pkgver=1.31
+_sha1=2e7c40dbdd68c5b21ef982d66bd24246f50a0110 # check project's timeline for it https://www.fossil-scm.org/fossil/timeline?y=ci
 # NOTE: update _date_pkgver from http://www.fossil-scm.org/download.html
-pkgrel=2
+pkgrel=1
 pkgdesc='Simple, high-reliability, distributed software configuration management'
 arch=(i686 x86_64)
 license=(BSD)
@@ -18,26 +18,18 @@
   fossil.socket
   fossil.service
   fossil-xinetd
-  fossil-autocomplete.bash
-  fossil-autocomplete.zsh
-  http://www.fossil-scm.org/download/fossil-src-$_date_pkgver.tar.gz
+  fossil-$pkgver.tar.gz::https://www.fossil-scm.org/fossil/tarball/Fossil-$_sha1.tar.gz?uuid=$_sha1
 )
 sha256sums=('f885e17998dc1eece1688a75e516663462fe72a7f4f132def4132055777c7ff8'
             'c4973079facf209d3757db81df08f8d0843ede242f2a0c12281720da65e3b166'
             '2f9a141fadfb7cb5225f0d65a308949bbc592bff9d567b5c472edb413c81f5aa'
-            '3e80a8a8f71ff450919df16864d987e669acf31670e484721b977a3bb2960a89'
-            'aeca50e6382da7c50d696cf971947a09cb14d572ee9f191b4113fd84286b5edd'
-            '37969e5a09c1611199921e3518a4ed736fd637a02f2d5810cd45897a4ceb92dc')
+            '3ebf2b4ce6057a3ff9ddb44704daee2ffd0d271de33449b25c7ff980deae08a9')
 
-prepare() {
-  cp fossil-autocomplete.{bash,zsh} fossil-src-$_date_pkgver/tools
-}
-
 build() {
-  cd fossil-src-$_date_pkgver
+  cd Fossil-$_sha1
   ./configure --prefix=/usr
   # headers and translate targets are problematic with parallel jobs
-  make -j1 bld bld/headers
+  #make -j1 bld bld/headers
   make
 }
 
@@ -46,9 +38,8 @@
   install -Dm644 fossil.socket "$pkgdir"/usr/lib/systemd/system/fossil.socket
   install -Dm644 fossil.service "$pkgdir"/usr/lib/systemd/system/fossil at .service
 
-  cd fossil-src-$_date_pkgver
+  cd Fossil-$_sha1
   install -Dm755 fossil "$pkgdir"/usr/bin/fossil
+  install -Dm644 tools/fossil-autocomplete.bash "$pkgdir"/usr/share/bash-completion/completions/fossil
   install -Dm644 COPYRIGHT-BSD2.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 tools/fossil-autocomplete.bash "$pkgdir"/usr/share/bash-completion/completions/fossil
-  install -Dm644 tools/fossil-autocomplete.zsh $pkgdir/usr/share/zsh/site-functions/_fossil
 }

Deleted: fossil-autocomplete.bash
===================================================================
--- fossil-autocomplete.bash	2015-02-23 19:10:12 UTC (rev 128144)
+++ fossil-autocomplete.bash	2015-02-23 19:11:27 UTC (rev 128145)
@@ -1,33 +0,0 @@
-# Command name bash completion for Fossil.
-# Original: Mailing-list contribution by Stuart Rackham.
-# Maintainer: Daniel YC Lin <dlin.tw at gmail.com>
-# I'm not bash expert, please feed back to me, if you could improve this.
-# TODO: fossil branch list --options
-
-function _fossil() {
-    local cur commands
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    commands=$(fossil help --all)
-    if [ $COMP_CWORD -eq 1 ] || [ ${COMP_WORDS[1]} = help ]; then
-            # Command name completion for 1st argument or 2nd if help command.
-        COMPREPLY=( $(compgen -W "$commands" $cur) )
-    else
-        case "${prev}" in
-            add) opts="--case-sensitive --dotfiles --force --ignore --clean" ;;
-            addremove) opts="--case-sensitive --dotfiles --ignore --clean --dry-run" ;;
-            all) opts="changes clean dbstat extras ignore info list pull push rebuild sync setting set unset" ;;
-            annotate) opts="--filevers --log --limit --ignore-all-space --ignore-trailing-space" ;;
-            bisect) opts="bad good log chart next options reset status undo" ;;
-            branch) opts="new list" ;;
-            merge) opts="--baseline --binary --case-sensitive --force --force-missing --integrate --dry-run --verbose" ;;
-        esac
-        compopt -o filenames
-        COMPREPLY=($(compgen -fW "${opts}" -- "${cur}") \
-        $(compgen -d -- "$cur"))
-        # File name completion for other arguments.
-        #COMPREPLY=( $(compgen -f $cur) )
-    fi
-}
-complete -o default -F _fossil fossil f
-# vim: et sw=4 ts=4

Deleted: fossil-autocomplete.zsh
===================================================================
--- fossil-autocomplete.zsh	2015-02-23 19:10:12 UTC (rev 128144)
+++ fossil-autocomplete.zsh	2015-02-23 19:11:27 UTC (rev 128145)
@@ -1,30 +0,0 @@
-#compdef fossil
-
-# zsh completion wrapper for zsh by Daniel YC Lin <dlin.tw at gmail.com>
-# I'm not zsh expert, please help me to fix this. 2015/02/06
-# TODO: fossil add -option<tab>
-#
-# Usage example:
-# 	cp fossil-autocomplete.zsh ~/zshfunc/_fossil
-#	fpath=(~/zshfunc $fpath)
-#	autoload -U ~/zshfunc/*(:t)
-# Package example:
-#       install -Dm644 fossil-autocomplete.zsh /share/zsh/site-functions/_fossil
-
-local curcontext="$curcontext" state line expl ret=1
-typeset -A opt_args
-
-_arguments -C \
-    '(-)--help[print help information]' \
-    '1: :->cmds' \
-    '*:files:_files' && ret=0
-
-_fossil_cmds=($(LC_ALL=C fossil help -a))
-_fossil_commands() {
-  compadd "$@" -k _fossil_cmds
-}
-case $state in
-  cmds)
-      _wanted commands expl 'fossil help' _fossil_commands && ret=0
-  ;;
-esac