X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=blobdiff_plain;f=git-core.spec;h=1a0985db615d7a780f33a1f3af2abb9157b5c3a6;hp=5f9af555170ac254efadfc48c8734ed7aa20acac;hb=HEAD;hpb=e460872a100e7b9c87bd1f2de98dd91416340c63

diff --git a/git-core.spec b/git-core.spec
index 5f9af55..9dc7554 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -5,21 +5,20 @@
 %bcond_without	tests_svn	# tests which use subversion
 %bcond_without	doc		# building/packaging docs/manuals (takes some time)
 %bcond_without	pcre		# perl-compatible regexes support
-%bcond_without	gnome_keyring	# gnome keyring credentials support
 %bcond_without	libsecret	# libsecret credentials support
 %bcond_without	tk		# Tcl/Tk interface
 
-# for AC: --without doc --without gnome_keyring --without tests
+# for AC: --without doc --without tests
 
 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.26.1
+Version:	2.45.0
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
-Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5:	50e68aaebbb554f4946d170a2765bfe7
+Source0:	https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
+# Source0-md5:	1daf15b08a3ef7bc58510ab75f5f1851
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -40,12 +39,9 @@ BuildRequires:	gettext-devel
 %else
 BuildRequires:	gettext-tools
 %endif
-%if %{with gnome_keyring} || %{with libsecret}
+%if %{with libsecret}
 BuildRequires:	glib2-devel >= 2.0
 %endif
-%if %{with gnome_keyring}
-BuildRequires:	libgnome-keyring-devel
-%endif
 %if %{with libsecret}
 BuildRequires:	libsecret-devel
 %endif
@@ -54,16 +50,19 @@ BuildRequires:	openssl-devel
 BuildRequires:	perl-Error > 0.15
 BuildRequires:	perl-MailTools
 BuildRequires:	perl-base
-%if %{with gnome_keyring} || %{with libsecret}
+%if %{with libsecret}
 BuildRequires:	pkgconfig
 %endif
-BuildRequires:	python-devel
+BuildRequires:	python3-devel
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.745
+BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	tar >= 1:1.22
 %if %{with tk}
 # wish
 BuildRequires:	tk
+BuildRequires:	xz
 %endif
 BuildRequires:	zlib-devel
 %if %{with doc}
@@ -72,6 +71,7 @@ BuildRequires:	docbook-dtd45-xml
 BuildRequires:	xmlto
 %endif
 %if %{with tests}
+BuildRequires:	openssh-clients
 BuildRequires:	perl-CGI
 BuildRequires:	perl-Digest-MD5
 BuildRequires:	perl-Encode
@@ -92,17 +92,15 @@ Requires:	grep
 # git-pull: printf
 Requires:	coreutils
 Requires:	sed
-Suggests:	git-core-bzr
 Suggests:	git-core-cvs
-Suggests:	git-core-hg
 Suggests:	git-core-p4
 Suggests:	git-core-svn
 Suggests:	less
 Suggests:	openssh-clients
 Suggests:	perl-Git = %{version}-%{release}
 Suggests:	rsync
-Obsoletes:	git-core-gitview
-Obsoletes:	python-Git
+Obsoletes:	git-core-gitview < 2.12.1
+Obsoletes:	python-Git < 1.8.5
 Conflicts:	perl-Git < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -156,9 +154,7 @@ katalogu.
 Summary:	Documentation for git-core
 Summary(pl.UTF-8):	Dokumentacja do git-core
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description doc
 Documentation for git-core.
@@ -172,9 +168,9 @@ Summary(pl.UTF-8):	Pliki niezbędne do uruchomienia git-daemona w trybie usługi
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	setup >= 2.4.11-1
-Provides:	git-core-daemon
-Obsoletes:	git-core-daemon
-Obsoletes:	git-core-daemon-standalone
+Provides:	git-core-daemon = %{version}-%{release}
+Obsoletes:	git-core-daemon <= %{version}-%{release}
+Obsoletes:	git-core-daemon-standalone <= %{version}-%{release}
 
 %description daemon-inetd
 Git-daemon is a really simple TCP git daemon that can serve git
@@ -191,9 +187,9 @@ Summary:	Files necessary to run git-daemon as a standalone service
 Summary(pl.UTF-8):	Pliki niezbędne do uruchomienia git-daemona w trybie usługi samodzielnej
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
-Provides:	git-core-daemon
-Obsoletes:	git-core-daemon
-Obsoletes:	git-core-daemon-inetd
+Provides:	git-core-daemon = %{version}-%{release}
+Obsoletes:	git-core-daemon <= %{version}-%{release}
+Obsoletes:	git-core-daemon-inetd <= %{version}-%{release}
 
 %description daemon-standalone
 Git-daemon is a really simple TCP git daemon that can serve git
@@ -223,9 +219,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
 
 %description gitk
 gitk displays changes in a repository or a selected set of commits.
@@ -304,19 +298,6 @@ Git tools for importing Arch repositories.
 %description arch -l pl.UTF-8
 Narzędzia Gita do importowania repozytoriów Archa.
 
-%package bzr
-Summary:	Git tools for working with bzr repositories
-Summary(pl.UTF-8):	Narzędzia Gita do pracy z repozytoriami bzr
-Group:		Development/Tools
-Requires:	%{name} = %{version}-%{release}
-Requires:	bzr
-
-%description bzr
-Git tools for working with bzr repositories.
-
-%description bzr -l pl.UTF-8
-Narzędzia Gita do pracy z repozytoriami bzr.
-
 %package cvs
 Summary:	CVS support for Git
 Summary(pl.UTF-8):	Obsługa CVS dla Gita
@@ -331,19 +312,6 @@ CVS support for Git.
 %description cvs -l pl.UTF-8
 Obsługa CVS dla Gita.
 
-%package hg
-Summary:	Git tools for working with mercurial repositories
-Summary(pl.UTF-8):	Narzędzia Gita do pracy z repozytoriami mercuriala
-Group:		Development/Tools
-Requires:	%{name} = %{version}-%{release}
-Requires:	mercurial >= 1.8
-
-%description hg
-Git tools for working with mercurial repositories.
-
-%description hg -l pl.UTF-8
-Narzędzia Gita do pracy z repozytoriami mercuriala.
-
 %package p4
 Summary:	Git tools for working with Perforce depots
 Summary(pl.UTF-8):	Narzędzia Gita do pracy z magazynami Perforce'a
@@ -363,6 +331,7 @@ Group:		Development/Tools
 Requires:	%{name} = %{version}-%{release}
 Requires:	perl-Encode
 Requires:	perl-Term-ReadKey
+Requires:	perl-modules
 
 %description svn
 Subversion support for Git.
@@ -385,15 +354,32 @@ Git tools for sending email.
 %description email -l pl.UTF-8
 Narzędzia Gita do wysyłania poczty.
 
+%package scalar
+Summary:	A tool for managing large Git repositories
+Summary(pl.UTF-8):	Narzędzie do zarządzania dużymi repozytoriami Git
+Group:		Development/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description scalar
+Scalar is a repository management tool that optimizes Git for use in
+large repositories. Scalar improves performance by configuring
+advanced Git settings, maintaining repositories in the background, and
+helping to reduce data sent across the network.
+
+%description scalar -l pl.UTF-8
+Scalar jest narzędziem do zarządzania repozytorium Git
+zoptymalizowanym pod kątem dużych repozytoriów. Scalar poprawia
+wydajność poprzez konfigurację zaawansowanych ustawień Git,
+utrzymywanie repozytoriów w tle oraz pomagając zredukować ilość
+danych wysyłanych po sieci.
+
 %package -n bash-completion-git
 Summary:	bash-completion for git
 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"
+Requires:	bash-completion >= 1:2.0
 BuildArch:	noarch
-%endif
 
 %description -n bash-completion-git
 This package provides bash-completion for git.
@@ -405,10 +391,9 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla gita.
 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"
+Requires:	perl-Error
+Obsoletes:	perl-git-core < 1.4.3.5
 BuildArch:	noarch
-%endif
 
 %description -n perl-Git
 This module provides Perl scripts easy way to interface the Git
@@ -424,33 +409,13 @@ dowolne polecenia Gita; w przyszłości interfejs udostępni także
 specjalne metody do łatwego wykonywania operacji nietrywialnych do
 wykonania przy użyciu ogólnego interfejsu poleceń.
 
-%package -n gnome-keyring-git-core
-Summary:	GNOME Keyring authentication provider for Git
-Summary(pl.UTF-8):	Moduł uwierzytelniający GNOME Keyring dla Gita
-Group:		X11/Applications
-URL:		http://git-scm.com/docs/gitcredentials.html
-Requires:	%{name} = %{version}-%{release}
-
-%description -n gnome-keyring-git-core
-Authentication provider module for Git which allows git client to
-authenticate using GNOME Keyring.
-
-You need to register it with:
-- git config --global credential.helper gnome-keyring
-
-%description -n gnome-keyring-git-core -l pl.UTF-8
-Moduł uwierzytelniający dla Gita pozwalający klientom git
-uwierzytelniać się przy użyciu mechanizmu GNOME Keyring.
-
-Moduł trzeba zarejestrować poleceniem:
-- git config --global credential.helper gnome-keyring
-
 %package credential-libsecret
 Summary:	GNOME authentication provider for Git using libsecret
 Summary(pl.UTF-8):	Moduł uwierzytelniający GNOME dla Gita wykorzystujący libsecret
 Group:		X11/Applications
 URL:		http://git-scm.com/docs/gitcredentials.html
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	gnome-keyring-git-core < 2.41.0
 
 %description credential-libsecret
 Authentication provider module for Git which allows git client to
@@ -466,26 +431,38 @@ uwierzytelniać się przy użyciu mechanizmu GNOME libsecret.
 Moduł trzeba zarejestrować poleceniem:
 - git config --global credential.helper libsecret
 
+%package -n zsh-completion-git
+Summary:	Zsh completion for git command
+Summary(pl.UTF-8):	Dopełnianie parametrów komendy git dla powłoki zsh
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion-git = %{version}-%{release}
+Requires:	zsh
+BuildArch:	noarch
+
+%description -n zsh-completion-git
+Zsh completion for git command.
+
+%description -n zsh-completion-git -l pl.UTF-8
+Dopełnianie parametrów komendy git dla powłoki zsh.
+
 %prep
 %setup -q -n git-%{version}
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
 
-%{__rm} {Documentation/technical,contrib/credential/gnome-keyring}/.gitignore
-
 # 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}
 %configure \
 	--sysconfdir=%{_sysconfdir}/git-core \
 	%{?with_pcre:--with-libpcre2} \
-	--with-openssl
+	--with-openssl \
+	--with-python="%{__python3}"
 
 echo "BLK_SHA1=1" >> config.mak
 
@@ -501,13 +478,6 @@ echo "BLK_SHA1=1" >> config.mak
 
 %{__make} -C contrib/subtree
 
-%if %{with gnome_keyring}
-%{__make} -C contrib/credential/gnome-keyring \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall" \
-	LDFLAGS="%{rpmldflags}"
-%endif
-
 %if %{with libsecret}
 %{__make} -C contrib/credential/libsecret \
 	CC="%{__cc}" \
@@ -577,10 +547,6 @@ cp -p {Makefile,config.mak,config.mak.autogen,config.mak.uname} $RPM_BUILD_ROOT%
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
-%if %{with gnome_keyring}
-install -p contrib/credential/gnome-keyring/git-credential-gnome-keyring $RPM_BUILD_ROOT%{gitcoredir}
-%endif
-
 %if %{with libsecret}
 install -p contrib/credential/libsecret/git-credential-libsecret $RPM_BUILD_ROOT%{gitcoredir}
 %endif
@@ -588,14 +554,14 @@ install -p contrib/credential/libsecret/git-credential-libsecret $RPM_BUILD_ROOT
 # bash completion
 install -d $RPM_BUILD_ROOT%{bash_compdir}
 cp -p contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{bash_compdir}/git
+install -d $RPM_BUILD_ROOT%{zsh_compdir}
+cp -p contrib/completion/git-completion.zsh $RPM_BUILD_ROOT%{zsh_compdir}/_git
+sed -i -e "1 a zstyle ':completion:*:*:git:*' script %{bash_compdir}/git" $RPM_BUILD_ROOT%{zsh_compdir}/_git
 
 # Install git-prompt.sh
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/completion
 cp -p contrib/completion/git-prompt.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/completion
 
-# Install bzr and hg remote helpers from contrib
-install -p contrib/remote-helpers/git-remote-{bzr,hg} $RPM_BUILD_ROOT%{gitcoredir}
-
 # gitweb
 %{__mv} $RPM_BUILD_ROOT{%{appdir},%{cgibindir}}/gitweb.cgi
 ln -s %{cgibindir}/gitweb.cgi $RPM_BUILD_ROOT%{appdir}/gitweb.cgi
@@ -637,15 +603,26 @@ ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-https
 ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftp
 ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftps
 
-# remove unneeded files
-%py_postclean
-
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/pt{_PT,}
 %find_lang git
 
 %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
 
@@ -697,19 +674,24 @@ 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}/man5/gitattributes.5*
+%{_mandir}/man5/gitformat-*.5*
 %{_mandir}/man5/githooks.5*
 %{_mandir}/man5/gitignore.5*
+%{_mandir}/man5/gitmailmap.5*
 %{_mandir}/man5/gitmodules.5*
+%{_mandir}/man5/gitprotocol-*.5*
 %{_mandir}/man5/gitrepository-layout.5*
 %{_mandir}/man7/gitcli.7*
 %{_mandir}/man7/gitcore-tutorial.7*
 %{_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*
@@ -738,14 +720,8 @@ fi
 %exclude %{gitcoredir}/git-gui
 %exclude %{gitcoredir}/git-imap-send
 %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}
-%exclude %{gitcoredir}/git-credential-gnome-keyring
-%endif
 %if %{with libsecret}
 %exclude %{gitcoredir}/git-credential-libsecret
 %endif
@@ -850,10 +826,6 @@ fi
 %{_mandir}/man1/git-archimport.1*
 %endif
 
-%files bzr
-%defattr(644,root,root,755)
-%attr(755,root,root) %{gitcoredir}/git-remote-bzr
-
 %files cvs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/git-cvsserver
@@ -863,19 +835,17 @@ fi
 %{_mandir}/man7/gitcvs-migration.7*
 %endif
 
-%files hg
-%defattr(644,root,root,755)
-%attr(755,root,root) %{gitcoredir}/git-remote-hg
-
 %files p4
 %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}
@@ -885,10 +855,18 @@ 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 scalar
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/scalar
+%attr(755,root,root) %{gitcoredir}/scalar
+%if %{with doc}
+%{_mandir}/man1/scalar.1*
 %endif
 
 %files -n bash-completion-git
@@ -907,16 +885,14 @@ fi
 %{perl_vendorlib}/Git/LoadCPAN/Error.pm
 %dir %{perl_vendorlib}/Git/LoadCPAN/Mail
 %{perl_vendorlib}/Git/LoadCPAN/Mail/Address.pm
-%{_mandir}/man3/Git.3pm*
-
-%if %{with gnome_keyring}
-%files -n gnome-keyring-git-core
-%defattr(644,root,root,755)
-%attr(755,root,root) %{gitcoredir}/git-credential-gnome-keyring
-%endif
+%{?with_doc:%{_mandir}/man3/Git.3pm*}
 
 %if %{with libsecret}
 %files credential-libsecret
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gitcoredir}/git-credential-libsecret
 %endif
+
+%files -n zsh-completion-git
+%defattr(644,root,root,755)
+%{zsh_compdir}/_git