Clean up redundant and unneeded Requires

Move all Requires to their own lines for better readability.

We can safely drop the 'perl(Git)' requires from the cvs and email
packages because the perl rpm dependency generator already add it.

We can also drop 'perl-Git = %{version}-%{release}' from the email
package because it requires 'git = %{version}-%{release}' which in turn
requires the matching 'perl-Git' package.
This commit is contained in:
Todd Zullinger 2018-04-08 18:02:12 -04:00
parent b5fac2ab8d
commit 5eb603d7e0

View File

@ -277,10 +277,10 @@ Documentation files for git-core package including man pages.
%package cvs %package cvs
Summary: Git tools for importing CVS repositories Summary: Git tools for importing CVS repositories
BuildArch: noarch BuildArch: noarch
Requires: git = %{version}-%{release}, cvs Requires: git = %{version}-%{release}
Requires: cvs
Requires: cvsps Requires: cvsps
Requires: perl(DBD::SQLite) Requires: perl(DBD::SQLite)
Requires: perl(Git)
%description cvs %description cvs
%{summary}. %{summary}.
%endif %endif
@ -302,10 +302,9 @@ The git daemon for supporting git:// access to git repositories
%package email %package email
Summary: Git tools for sending patches via email Summary: Git tools for sending patches via email
BuildArch: noarch BuildArch: noarch
Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: git = %{version}-%{release}
Requires: perl(Authen::SASL) Requires: perl(Authen::SASL)
Requires: perl(Net::SMTP::SSL) Requires: perl(Net::SMTP::SSL)
Requires: perl(Git)
%description email %description email
%{summary}. %{summary}.
@ -329,7 +328,8 @@ Requires: emacs-git = %{version}-%{release}
%package -n gitk %package -n gitk
Summary: Git repository browser Summary: Git repository browser
BuildArch: noarch BuildArch: noarch
Requires: git = %{version}-%{release}, tk >= 8.4 Requires: git = %{version}-%{release}
Requires: tk >= 8.4
%description -n gitk %description -n gitk
%{summary}. %{summary}.
@ -343,8 +343,8 @@ Requires: git = %{version}-%{release}
%package gui %package gui
Summary: Graphical interface to Git Summary: Graphical interface to Git
BuildArch: noarch BuildArch: noarch
Requires: git = %{version}-%{release}, tk >= 8.4
Requires: gitk = %{version}-%{release} Requires: gitk = %{version}-%{release}
Requires: tk >= 8.4
%description gui %description gui
%{summary}. %{summary}.
@ -384,11 +384,12 @@ history.
%package svn %package svn
Summary: Git tools for interacting with Subversion repositories Summary: Git tools for interacting with Subversion repositories
Requires: git = %{version}-%{release}, subversion Requires: git = %{version}-%{release}
Requires: perl(Digest::MD5) Requires: perl(Digest::MD5)
%if ! %{defined perl_bootstrap} %if ! %{defined perl_bootstrap}
Requires: perl(Term::ReadKey) Requires: perl(Term::ReadKey)
%endif %endif
Requires: subversion
%description svn %description svn
%{summary}. %{summary}.
@ -888,6 +889,9 @@ make test || ./print-failed-test-output
%{?with_docs:%{_pkgdocdir}/git-svn.html} %{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog %changelog
* Sun Apr 08 2018 Todd Zullinger <tmz@pobox.com>
- Clean up redundant and unneeded Requires
* Sat Apr 07 2018 Todd Zullinger <tmz@pobox.com> * Sat Apr 07 2018 Todd Zullinger <tmz@pobox.com>
- Remove Git::LoadCPAN to ensure we use only system perl modules - Remove Git::LoadCPAN to ensure we use only system perl modules