!8 git

Merge pull request !8 from syyhao/dev

git.spec

@@ -1,7 +1,7 @@
 %global gitexecdir          %{_libexecdir}/git-core
 Name:       git
 Version:    2.23.0
-Release:    9
+Release:    10
 Summary:    A popular and widely used Version Control System
 License:    GPLv2+ or LGPLv2.1
 URL:        https://git-scm.com/
@@ -30,7 +30,7 @@ Patch13:    CVE-2019-19604.patch
 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 perl-Error perl(Test::More) perl-MailTools perl(Test)
 Requires:      less zlib openssh-clients perl(Term::ReadKey) perl-Git
-Obsoletes:     %{name}-core %{name}-core-doc %{name}-subtree %{name}-p4
+Obsoletes:     %{name}-core %{name}-core-doc %{name}-subtree %{name}-p4 git-cvs < %{version}-%{release}
 Provides:      %{name} <= %{version}-%{release} %{name}-core %{name}-subtree %{name}-p4
 
 %description
@@ -78,16 +78,6 @@ Provides:    gitweb %{name}-instaweb
 %description web
 Git web interface allows user browsing git repositories via web service.
 
-
-%package cvs
-Summary:     Git tools for importing CVS repositories
-BuildArch:      noarch
-Requires:    %{name} = %{version}-%{release} cvs cvsps perl-DBD-SQLite
-
-%description cvs
-%{summary}.
-
-
 %package svn
 Summary:    Git tools for importing Subversion repositories
 BuildArch:      noarch
@@ -136,6 +126,8 @@ Provides:    %{name}-core-doc
 rm -rf perl/Git/LoadCPAN{.pm,/}
 grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g'
 
+sed -i '/^git-cvs/d' command-list.txt
+
 %build
 %configure
 
@@ -195,6 +187,8 @@ install -D -p -m 644 %{SOURCE102} %{buildroot}%{_unitdir}/git.socket
 install -pm 755 contrib/credential/libsecret/git-credential-libsecret  %{buildroot}%{gitexecdir}
 install -pm 755 contrib/credential/netrc/git-credential-netrc %{buildroot}%{gitexecdir}
 
+rm -f %{buildroot}%{_bindir}/git-cvsserver
+rm -f %{buildroot}%{gitexecdir}/git-cvs*
 
 %find_lang %{name}
 cat %{name}.lang >> git-bin-files
@@ -252,11 +246,6 @@ make test
 %{_localstatedir}/www/git/
 %{gitexecdir}/git-instaweb
 
-%files cvs
-%defattr(-,root,root)
-%{_bindir}/git-cvsserver
-%{gitexecdir}/git-cvs*
-
 %files svn
 %defattr(-,root,root)
 %{gitexecdir}/git-svn
@@ -279,6 +268,9 @@ make test
 %{_mandir}/man7/git*.7.*
 
 %changelog
+* Mon Feb 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.23.0-10
+- delete cvs subpackage
+
 * Mon Feb 03 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.23.0-9
 - fix CVE-2019-1348 CVE-2019-1349 CVE-2019-1350 CVE-2019-1351 CVE-2019-1352 
   CVE-2019-1353 CVE-2019-1354 CVE-2019-1387 CVE-2019-19604