From d600762c7f222a7e072c2fc27279ea088d2329b6 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 13 Jan 2020 15:07:31 +0300 Subject: [PATCH] bot: rpm5 -> rpm4 (8) --- git.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index c4076ca..afc2a73 100644 --- a/git.spec +++ b/git.spec @@ -276,7 +276,7 @@ perl -pi -e 's!^(GITWEB_CSS|GITWEB_LOGO|GITWEB_FAVICON) = !$1 = /gitweb/!' Makef %build # 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 -%make_build %{git_make_params} all doc gitweb +%make %{git_make_params} all doc gitweb # Produce RelNotes.txt.gz # 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 mkdir -p %{buildroot}%{_bindir} -%make_install prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" +%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot} # Avoid dependencies on obscure perl modules @@ -350,4 +350,4 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_bra # replies from svn versions older than the one # we're shipping -- and they have changed since rm -f t/t5700-protocol-v1.sh -LC_ALL=C %make_build %{git_make_params} test NO_SVN_TESTS=true +LC_ALL=C %make %{git_make_params} test NO_SVN_TESTS=true