BR: openssh-clients for tests; rel 2

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

diff --git a/git-core.spec b/git-core.spec
index d06626253dcdba554ed7c88373159281c7a17328..dd039dc465a8720a0c24101b3ee8546a907b9b70 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.33.1
-Release:       1
+Version:       2.36.1
+Release:       2
 License:       GPL v2
 Group:         Development/Tools
 Source0:       https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5: 3462f34d9c17288eee854b7645f6a0a1
+# Source0-md5: b069d4919c8d9faf28db4fd90feb8e1d
 Source1:       %{name}-gitweb.conf
 Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}-gitweb-lighttpd.conf
@@ -57,7 +57,8 @@ BuildRequires:        perl-base
 %if %{with gnome_keyring} || %{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.752
@@ -74,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
@@ -103,8 +105,8 @@ 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)
 
@@ -172,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
@@ -191,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
@@ -402,7 +404,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
 Requires:      perl-Error
-Obsoletes:     perl-git-core
+Obsoletes:     perl-git-core < 1.4.3.5
 BuildArch:     noarch
 
 %description -n perl-Git
@@ -487,15 +489,14 @@ Dopełnianie parametrów komendy git dla powłoki zsh.
 # 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
 
@@ -650,9 +651,6 @@ 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