bot: rpm5 -> rpm4 (1)

This commit is contained in:
NixTux Commit Bot 2020-01-04 03:37:48 +03:00
parent f50d8aff90
commit 3eb52464d4

View file

@ -27,10 +27,10 @@ BuildRequires: pkgconfig(zlib)
Requires: git-core = %{EVRD} Requires: git-core = %{EVRD}
Requires: git-svn = %{EVRD} Requires: git-svn = %{EVRD}
Requires: git-email = %{EVRD} Requires: git-email = %{EVRD}
Suggests: gitk = %{EVRD} Recommends: gitk = %{EVRD}
Suggests: git-arch = %{EVRD} Recommends: git-arch = %{EVRD}
Suggests: git-core-oldies = %{EVRD} Recommends: git-core-oldies = %{EVRD}
Suggests: git-cvs = %{EVRD} Recommends: git-cvs = %{EVRD}
Obsoletes: python-git < 1:2.11 Obsoletes: python-git < 1:2.11
%description %description
@ -52,7 +52,7 @@ This is a dummy package which brings in all subpackages.
Summary: Global Information Tracker Summary: Global Information Tracker
Group: Development/Other Group: Development/Other
Requires: diffutils Requires: diffutils
Suggests: git-prompt Recommends: git-prompt
Requires: less Requires: less
Requires: openssh-clients Requires: openssh-clients
Requires: rsync Requires: rsync
@ -163,8 +163,8 @@ Git tools for importing Subversion repositories.
Summary: Git tools for importing CVS repositories Summary: Git tools for importing CVS repositories
Group: Development/Other Group: Development/Other
Requires: git-core = %{EVRD} Requires: git-core = %{EVRD}
Suggests: cvs Recommends: cvs
Suggests: cvsps Recommends: cvsps
%description -n git-cvs %description -n git-cvs
Git tools for importing CVS repositories. Git tools for importing CVS repositories.
@ -180,7 +180,7 @@ Git tools for importing CVS repositories.
Summary: Git tools for importing Arch repositories Summary: Git tools for importing Arch repositories
Group: Development/Other Group: Development/Other
Requires: git-core = %{EVRD} Requires: git-core = %{EVRD}
Suggests: tla Recommends: tla
%description -n git-arch %description -n git-arch
Git tools for importing Arch repositories. Git tools for importing Arch repositories.
@ -195,8 +195,8 @@ Git tools for importing Arch repositories.
Summary: Git tools for sending email Summary: Git tools for sending email
Group: Development/Other Group: Development/Other
Requires: git-core = %{EVRD} Requires: git-core = %{EVRD}
Suggests: perl-Authen-SASL Recommends: perl-Authen-SASL
Suggests: perl-MIME-Base64 Recommends: perl-MIME-Base64
%description -n git-email %description -n git-email
Git tools for sending email. Git tools for sending email.
@ -276,7 +276,7 @@ perl -pi -e 's!^(GITWEB_CSS|GITWEB_LOGO|GITWEB_FAVICON) = !$1 = /gitweb/!' Makef
%build %build
# same flags and prefix must be passed for make test too # same flags and prefix must be passed for make test too
%define git_make_params prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=1 %define git_make_params prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=1
%make %{git_make_params} all doc gitweb %make_build %{git_make_params} all doc gitweb
# Produce RelNotes.txt.gz # Produce RelNotes.txt.gz
# sed trick changes "-x.y.z.txt" to "-x.y.z.0.txt" for ordering, then undoes it # sed trick changes "-x.y.z.txt" to "-x.y.z.0.txt" for ordering, then undoes it
@ -287,7 +287,7 @@ cd Documentation/RelNotes \
%install %install
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" %make_install prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}"
make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot} make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot}
# Avoid dependencies on obscure perl modules # Avoid dependencies on obscure perl modules
@ -354,4 +354,4 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_bra
# replies from svn versions older than the one # replies from svn versions older than the one
# we're shipping -- and they have changed since # we're shipping -- and they have changed since
rm -f t/t5700-protocol-v1.sh rm -f t/t5700-protocol-v1.sh
LC_ALL=C %make %{git_make_params} test NO_SVN_TESTS=true LC_ALL=C %make_build %{git_make_params} test NO_SVN_TESTS=true