From faf1ed948fcbfdcd789e69b0928625a5716d4418 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Wed, 31 Dec 2008 00:12:29 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create tag 'auto-ac-git-core- 1_6_1-1'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from master 2008-10-14 20:59:11 UTC Adam Gołębiowski '- git-daemon was moved away from PATH in 1.6.0' Cherrypick from unlabeled-1.97.2 2008-12-31 00:12:29 UTC Adam Gołębiowski '- updated to 1.6.1': git-core.spec -> 1.97.2.24 --- git-core.spec | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/git-core.spec b/git-core.spec index 877a137..c096c21 100644 --- a/git-core.spec +++ b/git-core.spec @@ -7,12 +7,12 @@ Summary: The stupid content tracker Summary(pl.UTF-8): Prymitywne narzędzie do śledzenia treści Name: git-core -Version: 1.6.0.2 +Version: 1.6.1 Release: 1 License: GPL v2 Group: Development/Tools Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2 -# Source0-md5: 1e4d9bfc1cb0abf165d4de93b5172324 +# Source0-md5: 66265d85593473b23290232b9dccef77 Source1: %{name}-gitweb.conf Source2: %{name}-gitweb-httpd.conf Source3: %{name}.sysconfig @@ -36,9 +36,11 @@ 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 +BuildRequires: cvs +BuildRequires: cvsps BuildRequires: pdksh >= 5.2.14-46 +# tests fail when using this client +BuildConflicts: cvs-nserver-client %endif Requires: coreutils Requires: cvsps >= 2.1-2 @@ -312,12 +314,25 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d} install *.h $RPM_BUILD_ROOT%{_includedir}/%{name} install xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff install libgit.a $RPM_BUILD_ROOT%{_libdir} +install xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a # bash completion 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} @@ -397,6 +412,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-* @@ -419,6 +435,7 @@ fi %defattr(644,root,root,755) %{_includedir}/git-core %{_libdir}/libgit.a +%{_libdir}/libgit_xdiff.a %files gitk %defattr(644,root,root,755) @@ -464,6 +481,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 -- 2.44.0