up to 2.44.0

diff --git a/git-core.spec b/git-core.spec
index 77cd56ec8dcecac7e3c6265743483d59ed54b545..1a0985db615d7a780f33a1f3af2abb9157b5c3a6 100644 (file)
--- 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.37.2
+Version:       2.44.0
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5: 2e4cb4fe7f778a9f621a735ba0585009
+# Source0-md5: 7e4eb7c45e9ba7c90fa51deeea49732f
 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,7 +50,7 @@ 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: python3-devel
@@ -96,9 +92,7 @@ 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
@@ -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
@@ -386,6 +354,25 @@ 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
@@ -422,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
@@ -485,8 +452,6 @@ Dopełnianie parametrów komendy git dla powłoki zsh.
 %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
 
@@ -513,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}" \
@@ -589,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
@@ -608,9 +562,6 @@ sed -i -e "1 a zstyle ':completion:*:*:git:*' script %{bash_compdir}/git" $RPM_B
 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
@@ -728,10 +679,12 @@ fi
 %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*
@@ -767,13 +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-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
@@ -878,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
@@ -891,10 +835,6 @@ 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
@@ -921,6 +861,14 @@ fi
 %{_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
 %defattr(644,root,root,755)
 %{bash_compdir}/git
@@ -939,12 +887,6 @@ fi
 %{perl_vendorlib}/Git/LoadCPAN/Mail/Address.pm
 %{?with_doc:%{_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
-
 %if %{with libsecret}
 %files credential-libsecret
 %defattr(644,root,root,755)