- up to 1.6.3.3

[packages/git-core.git] / git-core.spec

diff --git a/git-core.spec b/git-core.spec
index 6b8790667185ca3d18ef406a6b3df8aa25381778..dac85b3c4c0b04b6bb075cc7498178df5be64e88 100644 (file)
--- 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
+Version:       1.6.3.3
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5: 3d37e1f1e93c7828236e2af04ea0d071
+# Source0-md5: 91ae46ac01dadab1962beb064abd5b60
 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
@@ -312,12 +313,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}
@@ -334,6 +348,10 @@ install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon
 
+# paths cleanup
+sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon 
+sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
+
 # remove unneeded files
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist
@@ -380,7 +398,6 @@ fi
 %doc Documentation/RelNotes*
 %doc Documentation/*.html Documentation/howto Documentation/technical
 %{_mandir}/man1/git-*.1*
-%exclude %{_mandir}/man1/git-gui.1*
 %{_mandir}/man1/git.1*
 %{_mandir}/man5/gitattributes.5*
 %{_mandir}/man5/githooks.5*
@@ -394,10 +411,13 @@ 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-*
-%exclude %{_bindir}/git-gui
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/*-*
+%exclude %{_libdir}/%{name}/git-gui
 %{_datadir}/%{name}
 %{_localstatedir}/lib/git
 
@@ -414,6 +434,7 @@ fi
 %defattr(644,root,root,755)
 %{_includedir}/git-core
 %{_libdir}/libgit.a
+%{_libdir}/libgit_xdiff.a
 
 %files gitk
 %defattr(644,root,root,755)
@@ -427,6 +448,7 @@ fi
 %lang(de) %{_datadir}/gitk/lib/msgs/de.msg
 %lang(es) %{_datadir}/gitk/lib/msgs/es.msg
 %lang(it) %{_datadir}/gitk/lib/msgs/it.msg
+%lang(ru) %{_datadir}/gitk/lib/msgs/ru.msg
 %lang(sv) %{_datadir}/gitk/lib/msgs/sv.msg
 
 %files gitweb
@@ -446,8 +468,7 @@ fi
 
 %files gui
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/git-gui
-%{_mandir}/man1/git-gui.1*
+%attr(755,root,root) %{_libdir}/%{name}/git-gui
 %dir %{_datadir}/git-gui
 %dir %{_datadir}/git-gui/lib
 %dir %{_datadir}/git-gui/lib/msgs
@@ -460,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