This commit was manufactured by cvs2git to create tag 'auto-ac-git-core-

1_5_5_3-1'.

Sprout from master 2008-04-10 06:44:56 UTC Adam Gołębiowski <adamg@pld-linux.org> '- new'
Cherrypick from unlabeled-1.97.2 2008-05-29 20:49:25 UTC Elan Ruusamäe <glen@pld-linux.org> '- vimdatadir is in vim-rt package':
    git-core.spec -> 1.97.2.9

diff --git a/git-core.spec b/git-core.spec
index 3ae44be83b57b3348986086f27751968a070a3e0..17b263e15987da8b606827cf70e1bb769c2fd5ff 100644 (file)
--- 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.5.5
-Release:       2
+Version:       1.5.5.3
+Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5: 09f15f0b0e330986d930746abf6962f4
+# Source0-md5: 022ce5772b900243ef5d289deb7a3667
 Source1:       %{name}-gitweb.conf
 Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}.sysconfig
@@ -37,9 +37,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:      cpio
@@ -239,7 +241,7 @@ Summary:    Vim syntax: gitcommit
 Summary(pl.UTF-8):     Składnia dla Vima: gitcommit
 Group:         Applications/Editors/Vim
 # for _vimdatadir existence
-Requires:      vim >= 4:6.3.058-3
+Requires:      vim-rt >= 4:6.3.058-3
 
 %description -n vim-syntax-gitcommit
 This plugin provides syntax highlighting for git's commit messages.
@@ -355,6 +357,7 @@ fi
 %defattr(644,root,root,755)
 %doc README contrib
 %if %{with doc}
+%doc Documentation/RelNotes*
 %doc Documentation/{[!g]*,g[!i]*,git,git[!k]*}.html Documentation/howto Documentation/technical
 %{_mandir}/man1/git-*.1*
 %{_mandir}/man5/gitattributes.5*
@@ -393,8 +396,8 @@ fi
 %dir %{_datadir}/gitk
 %dir %{_datadir}/gitk/lib
 %dir %{_datadir}/gitk/lib/msgs
-%lang(de) %dir %{_datadir}/gitk/lib/msgs/de.msg
-%lang(it) %dir %{_datadir}/gitk/lib/msgs/it.msg
+%lang(de) %{_datadir}/gitk/lib/msgs/de.msg
+%lang(it) %{_datadir}/gitk/lib/msgs/it.msg
 
 %files gitweb
 %defattr(644,root,root,755)