[packages/git-core] bash_compdir included with rpm macros 1.673
glen
glen at pld-linux.org
Thu Mar 13 07:36:12 CET 2014
commit e43aceaa1625b33e26df5be2d55faacb4a9d2c65
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Mar 13 08:36:09 2014 +0200
bash_compdir included with rpm macros 1.673
git-core.spec | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/git-core.spec b/git-core.spec
index 2955419..2465e98 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -41,7 +41,7 @@ BuildRequires: perl-base
BuildRequires: python-devel
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.673
BuildRequires: tcl
BuildRequires: zlib-devel
%if %{with doc}
@@ -83,7 +83,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define webappdir %{_sysconfdir}/webapps/%{webapp}
%define appdir %{_datadir}/%{webapp}
%define cgibindir %{_prefix}/lib/cgi-bin
-%define bash_compdir %{_datadir}/bash-completion/completions
%description
"git" can mean anything, depending on your mood.
@@ -500,8 +499,8 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/lighttpd.conf
install -p contrib/gitview/gitview $RPM_BUILD_ROOT%{_bindir}
# git-daemon related files
-cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
-cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon
# paths cleanup
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/e43aceaa1625b33e26df5be2d55faacb4a9d2c65
More information about the pld-cvs-commit
mailing list