init

git.spec

@@ -1,7 +1,7 @@
 %global gitexecdir          %{_libexecdir}/git-core
 Name:       git
 Version:    2.23.0
-Release:    5
+Release:    6
 Summary:    A popular and widely used Version Control System
 License:    GPLv2+ or LGPLv2.1
 URL:        https://git-scm.com/
@@ -15,8 +15,8 @@ Source103:  git@.service.in
 Source104:  git.socket
 
 BuildRequires: openssl-devel libcurl-devel expat-devel systemd asciidoc xmlto glib2-devel libsecret-devel pcre-devel desktop-file-utils
-BuildRequires: python3-devel perl-generators perl-interpreter
-Requires:      less zlib openssh-clients 
+BuildRequires: python3-devel perl-generators perl-interpreter perl-Error perl(Test::More) perl-MailTools perl(Test)
+Requires:      less zlib openssh-clients
 Obsoletes:     %{name}-core %{name}-core-doc %{name}-subtree %{name}-p4
 Provides:      %{name} <= %{version}-%{release} %{name}-core %{name}-subtree %{name}-p4
 
@@ -96,7 +96,7 @@ Requires:       perl-Authen-SASL perl-Net-SMTP-SSL
 %package -n perl-Git
 Summary:        Perl interface to Git
 BuildArch:      noarch
-Requires:       git = %{version}-%{release} perl-libs
+Requires:       git = %{version}-%{release} perl(:MODULE_COMPAT_%(perl -V:version | cut -d"'" -f 2))
 
 %description -n perl-Git
 %{summary}.
@@ -104,7 +104,7 @@ Requires:       git = %{version}-%{release} perl-libs
 %package -n perl-Git-SVN
 Summary:        Perl interface to Git::SVN
 BuildArch:      noarch
-Requires:       git = %{version}-%{release} perl-libs
+Requires:       git = %{version}-%{release} perl(:MODULE_COMPAT_%(perl -V:version | cut -d"'" -f 2))
 
 %description -n perl-Git-SVN
 %{summary}.
@@ -121,6 +121,9 @@ Provides:    %{name}-core-doc
 %prep
 %autosetup -n %{name}-%{version}
 
+rm -rf perl/Git/LoadCPAN{.pm,/}
+grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g'
+
 %build
 %configure
 
@@ -137,6 +140,7 @@ PYTHON_PATH = %{__python3}
 htmldir = %{?_pkgdocdir}
 perllibdir = %{perl_vendorlib}
 gitwebdir = %{_localstatedir}/www/git
+NO_PERL_CPAN_FALLBACKS = 1
 EOF
 
 # Default using python3
@@ -264,6 +268,9 @@ make test
 %{_mandir}/man7/git*.7.*
 
 %changelog
+* Thu Dec 5 2019 shenyangyang <shenyangyang4@huawei.com> - 2.23.0-6
+- Delete the perl(Error*) module that provided by perl-Git
+
 * Thu Oct 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.23.0-5
 - Modify installation of contrib and templates