X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=blobdiff_plain;f=git-core.spec;h=8d853850571ffaa32ff6c2ea89989e9e750932c3;hp=e0a3501dd0408da5ae9b991b8af91b00a58aafdb;hb=760a71def62ba1c52d989c30110af5ef6b66608a;hpb=71ffe1572e0033aab9a8f66f97d732e61037a255 diff --git a/git-core.spec b/git-core.spec index e0a3501..8d85385 100644 --- a/git-core.spec +++ b/git-core.spec @@ -11,16 +11,15 @@ # for AC: --without doc --without gnome_keyring --without tests -%include /usr/lib/rpm/macros.perl Summary: Distributed version control system focused on speed, effectivity and usability Summary(pl.UTF-8): Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności Name: git-core -Version: 2.21.0 +Version: 2.30.0 Release: 1 License: GPL v2 Group: Development/Tools Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz -# Source0-md5: a74a7e716e1e548104bc942afc860fdb +# Source0-md5: 2457ee7e198bb949fecb0af94f7361a3 Source1: %{name}-gitweb.conf Source2: %{name}-gitweb-httpd.conf Source3: %{name}-gitweb-lighttpd.conf @@ -61,7 +60,7 @@ BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpm-pythonprov -BuildRequires: rpmbuild(macros) >= 1.673 +BuildRequires: rpmbuild(macros) >= 1.752 %if %{with tk} # wish BuildRequires: tk @@ -73,6 +72,10 @@ BuildRequires: docbook-dtd45-xml BuildRequires: xmlto %endif %if %{with tests} +BuildRequires: perl-CGI +BuildRequires: perl-Digest-MD5 +BuildRequires: perl-Encode +BuildRequires: perl-Time-HiRes %if %{with tests_cvs} # tests failed sometimes when using nserver/cvsnt client so enforce pure cvs here BuildRequires: cvs-gnu-client < 1.13 @@ -153,9 +156,7 @@ katalogu. Summary: Documentation for git-core Summary(pl.UTF-8): Dokumentacja do git-core Group: Documentation -%if "%{_rpmversion}" >= "5" -BuildArch: noarch -%endif +%{?noarchpackage} %description doc Documentation for git-core. @@ -220,9 +221,7 @@ Summary(pl.UTF-8): Napisany w Tcl/Tk interfejs do systemu kontroli wersji Git Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: tk -%if "%{_rpmversion}" >= "5" -BuildArch: noarch -%endif +%{?noarchpackage} %description gitk gitk displays changes in a repository or a selected set of commits. @@ -388,9 +387,7 @@ Summary(pl.UTF-8): bashowe uzupełnianie nazw dla gita Group: Applications/Shells Requires: %{name} = %{version}-%{release} Requires: bash-completion >= 2.0 -%if "%{_rpmversion}" >= "5" -BuildArch: noarch -%endif +%{?noarchpackage} %description -n bash-completion-git This package provides bash-completion for git. @@ -403,9 +400,7 @@ Summary: Perl interface to the Git version control system Summary(pl.UTF-8): Perlowy interfejs do systemu kontroli wersji Git Group: Development/Languages/Perl Obsoletes: perl-git-core -%if "%{_rpmversion}" >= "5" -BuildArch: noarch -%endif +%{?noarchpackage} %description -n perl-Git This module provides Perl scripts easy way to interface the Git @@ -474,6 +469,8 @@ Moduł trzeba zarejestrować poleceniem: # we build things in contrib but want to have it clean for doc purporses, too cp -a contrib contrib-doc +%{__sed} -i -e '1s|#!/usr/bin/env python$|#!%{__python}|' git-p4.py + %build %{__aclocal} %{__autoconf} @@ -641,6 +638,20 @@ ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftps %clean rm -rf $RPM_BUILD_ROOT +%post +if [ ! -f /etc/shells ]; then + echo "%{_bindir}/git-shell" >> /etc/shells +else + grep -q '^%{_bindir}/git-shell$' /etc/shells || echo "%{_bindir}/git-shell" >> /etc/shells +fi + +%preun +if [ "$1" = "0" ]; then + umask 022 + grep -v '^%{_bindir}/git-shell$' /etc/shells > /etc/shells.new + mv -f /etc/shells.new /etc/shells +fi + %post daemon-inetd %service -q rc-inetd reload @@ -692,10 +703,10 @@ fi %exclude %{_mandir}/man1/git-archimport.1* %exclude %{_mandir}/man1/git-svn.1* %exclude %{_mandir}/man1/git-cvs*.1* -%exclude %{_mandir}/man1/git-imap-send*.1* -%exclude %{_mandir}/man1/*email*.1* +%exclude %{_mandir}/man1/git-imap-send.1* +%exclude %{_mandir}/man1/git-p4.1* +%exclude %{_mandir}/man1/git-send-email.1* %{_mandir}/man1/git.1* -%{_mandir}/man1/gitremote-helpers.1* %{_mandir}/man5/gitattributes.5* %{_mandir}/man5/githooks.5* %{_mandir}/man5/gitignore.5* @@ -706,8 +717,10 @@ fi %{_mandir}/man7/gitcredentials.7* %{_mandir}/man7/gitdiffcore.7* %{_mandir}/man7/giteveryday.7* +%{_mandir}/man7/gitfaq.7* %{_mandir}/man7/gitglossary.7* %{_mandir}/man7/gitnamespaces.7* +%{_mandir}/man7/gitremote-helpers.7* %{_mandir}/man7/gitrevisions.7* %{_mandir}/man7/gitsubmodules.7* %{_mandir}/man7/gittutorial-2.7* @@ -735,7 +748,6 @@ fi %exclude %{gitcoredir}/git-instaweb %exclude %{gitcoredir}/git-remote-bzr %exclude %{gitcoredir}/git-remote-hg -%exclude %{gitcoredir}/git-remote-testsvn %exclude %{gitcoredir}/git-svn %exclude %{gitcoredir}/mergetools/p4merge %if %{with gnome_keyring} @@ -790,6 +802,7 @@ fi %lang(ru) %{_datadir}/gitk/lib/msgs/ru.msg %lang(sv) %{_datadir}/gitk/lib/msgs/sv.msg %lang(vi) %{_datadir}/gitk/lib/msgs/vi.msg +%lang(zh_CN) %{_datadir}/gitk/lib/msgs/zh_cn.msg %endif %files gitweb @@ -865,11 +878,13 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{gitcoredir}/git-p4 %attr(755,root,root) %{gitcoredir}/mergetools/p4merge +%if %{with doc} +%{_mandir}/man1/git-p4.1* +%endif %files svn %defattr(644,root,root,755) %attr(755,root,root) %{gitcoredir}/git-svn -%attr(755,root,root) %{gitcoredir}/git-remote-testsvn %{perl_vendorlib}/Git/SVN %{perl_vendorlib}/Git/SVN.pm %if %{with doc} @@ -879,10 +894,10 @@ fi %files email %defattr(644,root,root,755) %attr(755,root,root) %{gitcoredir}/git-imap-send -%attr(755,root,root) %{gitcoredir}/*email* +%attr(755,root,root) %{gitcoredir}/git-send-email %if %{with doc} -%{_mandir}/man1/*email*.1* -%{_mandir}/man1/*imap-send*.1* +%{_mandir}/man1/git-imap-send.1* +%{_mandir}/man1/git-send-email.1* %endif %files -n bash-completion-git @@ -901,7 +916,7 @@ fi %{perl_vendorlib}/Git/LoadCPAN/Error.pm %dir %{perl_vendorlib}/Git/LoadCPAN/Mail %{perl_vendorlib}/Git/LoadCPAN/Mail/Address.pm -%{_mandir}/man3/Git.3pm* +%{?with_doc:%{_mandir}/man3/Git.3pm*} %if %{with gnome_keyring} %files -n gnome-keyring-git-core