X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=git-core.spec;h=45dfb184b8b834e9b4bfe60dbfc58ffd64a8e253;hb=16781e9eaea39a07709f1cb48c492c1c27dfe66f;hp=65e2136edf831e934b85277b0d831e8e90ccfb5e;hpb=a9299ab1751e4a9ca9d327df234b113628175a59;p=packages%2Fgit-core.git

diff --git a/git-core.spec b/git-core.spec
index 65e2136..45dfb18 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -7,18 +7,18 @@
 Summary:	The stupid content tracker
 Summary(pl.UTF-8):	Prymitywne narzędzie do śledzenia treści
 Name:		git-core
-Version:	1.6.0.6
+Version:	1.6.2
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5:	b5be9b34b441cb57f92086bfaf59f255
+# Source0-md5:	12c7d874e17c6e111697b1714b5f4319
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}.sysconfig
 Source4:	%{name}.inet
 Source5:	%{name}.init
-URL:		http://git.or.cz/
+URL:		http://git-scm.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	curl-devel
@@ -36,8 +36,9 @@ BuildRequires:	asciidoc >= 7.1.2-3
 BuildRequires:	xmlto
 %endif
 %if %{with tests}
-# tests failed sometimes when using nserver client 1.11(?)
-BuildRequires:	cvs-client >= 1.12
+# tests failed sometimes when using nserver/cvsnt client so enforce pure cvs here
+BuildRequires:	cvs-gnu-client >= 1.12
+BuildRequires:	cvs-gnu-client < 1.13
 BuildRequires:	pdksh >= 5.2.14-46
 %endif
 Requires:	coreutils
@@ -318,7 +319,19 @@ install xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
 install contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 # vim syntax
-install contrib/vim/syntax/gitcommit.vim $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/syntax
+cat > $RPM_BUILD_ROOT/%{_datadir}/vim/vimfiles/syntax/gitcommit.vim << 'EOF'
+autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG    setf gitcommit
+autocmd BufNewFile,BufRead *.git/config,.gitconfig setf gitconfig
+autocmd BufNewFile,BufRead git-rebase-todo         setf gitrebase
+autocmd BufNewFile,BufRead .msg.[0-9]*
+	\ if getline(1) =~ '^From.*# This line is ignored.$' |
+	\   setf gitsendemail |
+	\ endif
+autocmd BufNewFile,BufRead *.git/**
+	\ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
+	\   setf git |
+	\ endif
+EOF
 
 # gitweb
 install gitweb/*.css gitweb/*.png $RPM_BUILD_ROOT%{appdir}
@@ -398,6 +411,7 @@ fi
 %{_mandir}/man7/gitglossary.7*
 %{_mandir}/man7/gittutorial-2.7*
 %{_mandir}/man7/gittutorial.7*
+%{_mandir}/man7/gitworkflows.7*
 %endif
 %attr(755,root,root) %{_bindir}/git
 %attr(755,root,root) %{_bindir}/git-*
@@ -466,6 +480,7 @@ fi
 %lang(hu) %{_datadir}/git-gui/lib/msgs/hu.msg
 %lang(it) %{_datadir}/git-gui/lib/msgs/it.msg
 %lang(ja) %{_datadir}/git-gui/lib/msgs/ja.msg
+%lang(nb) %{_datadir}/git-gui/lib/msgs/nb.msg
 %lang(ru) %{_datadir}/git-gui/lib/msgs/ru.msg
 %lang(sv) %{_datadir}/git-gui/lib/msgs/sv.msg
 %lang(zh_cn) %{_datadir}/git-gui/lib/msgs/zh_cn.msg