Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2013-12-03 14:26:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2013-11-27 15:28:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2013-12-03 14:26:03.000000000 +0100 @@ -1,0 +2,22 @@ +Tue Dec 3 11:26:19 CET 2013 - [email protected] + +- Add missing obsoletes for git-remote-helpers subpackage, which + was dropped in git 1.8.5 + +------------------------------------------------------------------- +Mon Dec 2 17:38:45 CET 2013 - [email protected] + +- git-tcsh-completion-fixes.diff: + git-zsh-completion-fixes.diff: + install tcsh and zsh completion files (bnc#853183) + +------------------------------------------------------------------- +Mon Dec 2 01:56:36 UTC 2013 - [email protected] + +- updated to version 1.8.5 + + * remove git-python-install-fix.diff, no longer to use it. + + https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.5.txt + +------------------------------------------------------------------- Old: ---- git-1.8.4.4.tar.gz git-python-install-fix.diff New: ---- git-1.8.5.tar.gz git-tcsh-completion-fixes.diff git-zsh-completion-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.7hrQTI/_old 2013-12-03 14:26:04.000000000 +0100 +++ /var/tmp/diff_new_pack.7hrQTI/_new 2013-12-03 14:26:04.000000000 +0100 @@ -20,7 +20,7 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: git -Version: 1.8.4.4 +Version: 1.8.5 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 @@ -34,12 +34,15 @@ Source4: git.xinetd Source5: usr.share.git-web.gitweb.cgi Source6: susefirewall-git-daemon -Patch2: git-python-install-fix.diff Patch3: completion-wordbreaks.diff # CVE-2011-2186, bnc#698456 Patch4: git-prevent_xss-default.diff # fix broken bash copmletion with colored egrep (bnc#779536) Patch5: git-bash-completion-egrep-color-fix.diff +# cook up tcsh completion to be installable (bnc#853183) +Patch6: git-tcsh-completion-fixes.diff +# adapt paths in zsh completion (bnc#853183) +Patch7: git-zsh-completion-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2 BuildRequires: asciidoc @@ -52,6 +55,7 @@ BuildRequires: perl-Error BuildRequires: python BuildRequires: sgml-skel +BuildRequires: tcsh BuildRequires: xmlto Requires: git-core = %{version} Recommends: git-svn git-cvs git-email gitk git-gui git-web @@ -76,6 +80,7 @@ Requires: perl-Error Requires: perl-base = %{perl_version} Requires: rsync +Obsoletes: git-remote-helpers < %{version} %description core Git is a fast, scalable, distributed revision control system with an @@ -182,21 +187,13 @@ The apache2 configuration contained in this package installs a virtual directory /git/ that calls the cgi script. -%package remote-helpers -Summary: Python package for remote helper scripts -Group: Development/Tools/Version Control -Requires: git-core = %{version} -Requires: python - -%description remote-helpers -This package contains the building blocks for remote helpers written in Python. - %prep %setup -q -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build cat > .make <<'EOF' @@ -253,6 +250,14 @@ find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh install -m 644 -D contrib/completion/git-prompt.sh $RPM_BUILD_ROOT/etc/bash_completion.d/git-prompt.sh +# process tcsh completion +(cd contrib/completion + mkdir -p $RPM_BUILD_ROOT/usr/share/tcsh + tcsh ./git-completion.tcsh + install -m 644 -D git.csh $RPM_BUILD_ROOT/etc/profile.d/git.csh +) +# zsh completion +install -m 644 -D contrib/completion/git-completion.zsh $RPM_BUILD_ROOT/etc/zsh_completion.d/_git # # apparmor profile for git-web # @@ -360,14 +365,6 @@ /usr/share/gitweb /etc/apparmor.d -%files remote-helpers -%defattr(-,root,root) -%if %suse_version >= 1120 -%python_sitelib/* -%else -%py_sitedir/* -%endif - %files core -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ @@ -382,5 +379,8 @@ %{perl_vendorlib}/Git/ %{perl_vendorarch}/auto/Git/ /etc/bash_completion.d/*.sh +/usr/share/tcsh +/etc/profile.d/*.csh +/etc/zsh_completion.d %changelog ++++++ git-1.8.4.4.tar.gz -> git-1.8.5.tar.gz ++++++ ++++ 80860 lines of diff (skipped) ++++++ git-tcsh-completion-fixes.diff ++++++ --- contrib/completion/git-completion.tcsh | 7 ++----- contrib/completion/git.csh | 5 +++++ contrib/completion/git.tcsh | 5 +++++ 3 files changed, 12 insertions(+), 5 deletions(-) --- a/contrib/completion/git-completion.tcsh +++ b/contrib/completion/git-completion.tcsh @@ -34,8 +34,8 @@ if ( ${__git_tcsh_completion_version[1]} endif unset __git_tcsh_completion_version -set __git_tcsh_completion_original_script = ${HOME}/.git-completion.bash -set __git_tcsh_completion_script = ${HOME}/.git-completion.tcsh.bash +set __git_tcsh_completion_original_script = /etc/bash_completion.d/git.sh +set __git_tcsh_completion_script = $RPM_BUILD_ROOT/usr/share/tcsh/git.complete # Check that the user put the script in the right place if ( ! -e ${__git_tcsh_completion_original_script} ) then @@ -123,6 +123,3 @@ EOF # Don't need this variable anymore, so don't pollute the users environment unset __git_tcsh_completion_original_script - -complete git 'p,*,`bash ${__git_tcsh_completion_script} git "${COMMAND_LINE}"`,' -complete gitk 'p,*,`bash ${__git_tcsh_completion_script} gitk "${COMMAND_LINE}"`,' --- /dev/null +++ b/contrib/completion/git.csh @@ -0,0 +1,5 @@ +if (! ${?prompt}) goto end +complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,' +complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,' +done: + --- /dev/null +++ b/contrib/completion/git.tcsh @@ -0,0 +1,5 @@ +if (! ${?prompt} || ! ${?tcsh}) goto end +complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,' +complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,' +end: + ++++++ git-zsh-completion-fixes.diff ++++++ --- contrib/completion/git-completion.zsh | 1 + 1 file changed, 1 insertion(+) --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -30,6 +30,7 @@ if [ -z "$script" ]; then local -a locations local e locations=( + '/etc/bash_completion.d/git.sh' # suse '/etc/bash_completion.d/git' # fedora, old debian '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian '/usr/share/bash-completion/git' # gentoo -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
