up to 2.36.0

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

diff --git a/git-core.spec b/git-core.spec
index 7390f3e184702342e98645d1cebef0e6be55e001..013d52fff2c5a366ff597aa857ee371c2dcd9be3 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.35.0
+Version:       2.36.0
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5: 272d8e75a7f309943f62a0826ef799bd
+# Source0-md5: a764a4b95dee25362a5f9696d5e0fd81
 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
@@ -103,8 +104,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)
 
@@ -402,7 +403,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 +488,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 +650,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