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

Drop unnecessary Conflicts: when git-p4 is disabled

Browse Source 
The Obsoletes: tag is sufficient to ensure git-p4 is removed when
updating to a newer git which lacks a git-p4 subpackage.
This commit is contained in:
Todd Zullinger 2018-09-08 01:26:14 -04:00
parent 2b58811801
commit cf5fc1863f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git.spec
View File

@ -220,7 +220,6 @@ Obsoletes: git-gnome-keyring < 2.11.1-4
# Obsolete git-p4 if it's disabled
%if %{without p4}
Obsoletes: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release}
Conflicts: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%description
@ -881,6 +880,7 @@ make -C contrib/credential/netrc/ testverbose
%changelog
* 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
* Tue Sep 04 2018 Nils Philippsen <nils@redhat.com> - 2.19.0-0.2.rc1
- obsolete git-p4 if it's disabled