up to 2.38.1 (fixes CVE-2022-39253 CVE-2022-39260)

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

diff --git a/git-core.spec b/git-core.spec
index a6090badef9cf147f9bbb831c479d094fe01a4b1..fddf3290428b16cb04792c37d416178ad46bf7fc 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -14,12 +14,12 @@
 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.36.1
+Version:       2.38.1
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5: b069d4919c8d9faf28db4fd90feb8e1d
+# Source0-md5: abdafbfb85d205421903a2100c734b17
 Source1:       %{name}-gitweb.conf
 Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}-gitweb-lighttpd.conf
@@ -75,6 +75,7 @@ BuildRequires:        docbook-dtd45-xml
 BuildRequires: xmlto
 %endif
 %if %{with tests}
+BuildRequires: openssh-clients
 BuildRequires: perl-CGI
 BuildRequires: perl-Digest-MD5
 BuildRequires: perl-Encode
@@ -173,9 +174,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
@@ -192,9 +193,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
@@ -362,6 +363,7 @@ Group:              Development/Tools
 Requires:      %{name} = %{version}-%{release}
 Requires:      perl-Encode
 Requires:      perl-Term-ReadKey
+Requires:      perl-modules
 
 %description svn
 Subversion support for Git.
@@ -384,12 +386,31 @@ 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
+Requires:      bash-completion >= 1:2.0
 BuildArch:     noarch
 
 %description -n bash-completion-git
@@ -726,10 +747,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*
@@ -919,6 +942,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