rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Obsolete git-cvs if it's disabled

Browse Source 
Similar to git-p4 in 5032bef ("bump release", 2018-09-04), add
Obsoletes: for git-cvs when it is disabled.
This commit is contained in:
Todd Zullinger 2018-09-04 20:39:54 -04:00
parent cf5fc1863f
commit 601f4c9e87
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git.rpmlintrc
View File

@ -19,5 +19,5 @@ addFilter("perl-Git-SVN.noarch: W: no-documentation")
addFilter("git-core\..*: W: no-manual-page-for-binary")
# nothing provides git-gnome-keyring, it's simply obsolete
# similarly ignore the warning when git-p4 is disabled
addFilter("git.* obsolete-not-provided git-(gnome-keyring|p4)")
# similarly ignore the warning when git-cvs and git-p4 are disabled
addFilter("git.* obsolete-not-provided git-(cvs|gnome-keyring|p4)")

6
git.spec
View File

@ -214,6 +214,11 @@ Requires: perl-Git = %{version}-%{release}
Requires: emacs-filesystem >= %{_emacs_version}
%endif
# Obsolete git-cvs if it's disabled
%if %{without cvs}
Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
# Obsolete gnome-keyring credential helper (remove after Fedora 29)
Obsoletes: git-gnome-keyring < 2.11.1-4
@ -881,6 +886,7 @@ make -C contrib/credential/netrc/ testverbose
* Tue Sep 04 2018 Todd Zullinger <tmz@pobox.com> - 2.19.0-0.3.rc2
- Update to 2.19.0.rc2
- Drop unnecessary Conflicts: when git-p4 is disabled
- Obsolete git-cvs if it's disabled
* Tue Sep 04 2018 Nils Philippsen <nils@redhat.com> - 2.19.0-0.2.rc1
- obsolete git-p4 if it's disabled