Drop git-gnome-keyring obsolete for fedora > 30

Add a conditional to allow merging from master to f29.  The obsoletes
should be removed when f29 is EOL.  It was added in 2d1c8b1 ("Remove
obsolete gnome-keyring credential helper", 2018-01-09).  The comment was
improved in 4a06e99 ("clarify comment for obsolete git-gnome-keyring",
2018-09-04).
This commit is contained in:
Todd Zullinger 2018-09-05 01:03:37 -04:00
parent 1fe470a26e
commit 3bd04f23dc

View File

@ -220,7 +220,9 @@ Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
# Obsolete gnome-keyring credential helper (remove after Fedora 29)
%if 0%{?fedora} && 0%{?fedora} < 30
Obsoletes: git-gnome-keyring < 2.11.1-4
%endif
# Obsolete git-p4 if it's disabled
%if %{without p4}
@ -893,6 +895,7 @@ make -C contrib/credential/netrc/ testverbose
- Obsolete git-cvs if it's disabled
- Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and
contrib/svn-fe which all require python2
- Drop git-gnome-keyring obsolete for fedora > 30
* Tue Sep 04 2018 Nils Philippsen <nils@redhat.com> - 2.19.0-0.2.rc1
- obsolete git-p4 if it's disabled