Quiet some rpmlint complaints

1 files changed, 57 insertions, 51 deletions

diff --git a/git.spec b/git.spec
index fbba5f5..24b0043 100644
--- a/git.spec
+++ b/git.spec
@@ -1,23 +1,23 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
-Name: 		git
-Version: 	1.6.0.6
-Release: 	2%{?dist}
-Summary:  	Core git tools
-License: 	GPLv2
-Group: 		Development/Tools
-URL: 		http://kernel.org/pub/software/scm/git/
-Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
-Source1:	git-init.el
-Source2:	git.xinetd
-Source3:	git.conf.httpd
-Patch0:		git-1.5-gitweb-home-link.patch
-BuildRequires:	zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:	perl-Git = %{version}-%{release}
-Requires:	zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error)
-Provides:	git-core = %{version}-%{release}
-Obsoletes:	git-core <= 1.5.4.3
+Name:           git
+Version:        1.6.0.6
+Release:        2%{?dist}
+Summary:        Core git tools
+License:        GPLv2
+Group:          Development/Tools
+URL:            http://kernel.org/pub/software/scm/git/
+Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
+Source1:        git-init.el
+Source2:        git.xinetd
+Source3:        git.conf.httpd
+Patch0:         git-1.5-gitweb-home-link.patch
+BuildRequires:  zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:       perl-Git = %{version}-%{release}
+Requires:       zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error)
+Provides:       git-core = %{version}-%{release}
+Obsoletes:      git-core <= 1.5.4.3
 
 %description
 Git is a fast, scalable, distributed revision control system with an
@@ -29,18 +29,18 @@ install all git packages, including tools for integrating with other
 SCMs, install the git-all meta-package.
 
 %package all
-Summary:	Meta-package to pull in all git tools
-Group:		Development/Tools
-Requires:	git = %{version}-%{release}
-Requires:	git-svn = %{version}-%{release}
-Requires:	git-cvs = %{version}-%{release}
-Requires:	git-arch = %{version}-%{release}
-Requires:	git-email = %{version}-%{release}
-Requires:	gitk = %{version}-%{release}
-Requires:	git-gui = %{version}-%{release}
-Requires:	perl-Git = %{version}-%{release}
-Requires:	emacs-git = %{version}-%{release}
-Obsoletes:	git <= 1.5.4.3
+Summary:        Meta-package to pull in all git tools
+Group:          Development/Tools
+Requires:       git = %{version}-%{release}
+Requires:       git-svn = %{version}-%{release}
+Requires:       git-cvs = %{version}-%{release}
+Requires:       git-arch = %{version}-%{release}
+Requires:       git-email = %{version}-%{release}
+Requires:       gitk = %{version}-%{release}
+Requires:       git-gui = %{version}-%{release}
+Requires:       perl-Git = %{version}-%{release}
+Requires:       emacs-git = %{version}-%{release}
+Obsoletes:      git <= 1.5.4.3
 
 %description all
 Git is a fast, scalable, distributed revision control system with an
@@ -50,9 +50,9 @@ and full access to internals.
 This is a dummy package which brings in all subpackages.
 
 %package daemon
-Summary:	Git protocol dæmon
-Group:		Development/Tools
-Requires:	git = %{version}-%{release}
+Summary:        Git protocol dæmon
+Group:          Development/Tools
+Requires:       git = %{version}-%{release}
 %description daemon
 The git dæmon for supporting git:// access to git repositories
 
@@ -89,8 +89,8 @@ Git tools for importing Arch repositories.
 %package email
 Summary:        Git tools for sending email
 Group:          Development/Tools
-Requires:	git = %{version}-%{release}, perl-Git = %{version}-%{release}
-Requires:   perl(Net::SMTP::SSL)
+Requires:       git = %{version}-%{release}, perl-Git = %{version}-%{release}
+Requires:       perl(Net::SMTP::SSL)
 %description email
 Git tools for sending email.
 
@@ -120,9 +120,9 @@ BuildRequires:  perl(Error), perl(ExtUtils::MakeMaker)
 Perl interface to Git.
 
 %package -n emacs-git
-Summary:       Git version control system support for Emacs
-Group:         Applications/Editors
-Requires:      git = %{version}-%{release}, emacs-common
+Summary:        Git version control system support for Emacs
+Group:          Applications/Editors
+Requires:       git = %{version}-%{release}, emacs-common
 
 %description -n emacs-git
 %{summary}.
@@ -133,24 +133,24 @@ Requires:      git = %{version}-%{release}, emacs-common
 
 %build
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-     ETC_GITCONFIG=%{_sysconfdir}/gitconfig \
-     prefix=%{_prefix} all %{!?_without_docs: doc}
+    ETC_GITCONFIG=%{_sysconfdir}/gitconfig \
+    prefix=%{_prefix} all %{!?_without_docs: doc}
 make -C contrib/emacs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
-     prefix=%{_prefix} mandir=%{_mandir} INSTALL="install -p" \
-     ETC_GITCONFIG=%{_sysconfdir}/gitconfig \
-     INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
+    prefix=%{_prefix} mandir=%{_mandir} INSTALL="install -p" \
+    ETC_GITCONFIG=%{_sysconfdir}/gitconfig \
+    INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
 make -C contrib/emacs install \
-		 emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+    emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do
-	install -pm 644 contrib/emacs/$(basename $elc .elc).el \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+    install -pm 644 contrib/emacs/$(basename $elc .elc).el \
+    $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 done
 install -Dpm 644 %{SOURCE1} \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el
+    $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el
 mkdir -p $RPM_BUILD_ROOT%{_var}/www/git
 install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css
 install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi
@@ -164,7 +164,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
 (find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
 (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
 %if %{!?_without_docs:1}0
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
 %else
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 %endif
@@ -176,6 +176,11 @@ install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
 
+# quiet some rpmlint complaints
+chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/*
+rm -f Documentation/technical/.gitignore
+chmod a-x Documentation/technical/api-index.sh
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -266,6 +271,7 @@ rm -rf $RPM_BUILD_ROOT
 - Install git-* commands in %%{_libexecdir}/git-core, the upstream default
 - Remove libcurl from Requires, rpm will pick this up automatically
 - Preserve timestamps on installed files
+- Quiet some rpmlint complaints
 - Use macros more consistently
 
 * Sat Dec 20 2008 Todd Zullinger <tmz@pobox.com> 1.6.0.6-1
@@ -521,7 +527,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jan 10 2006 Chris Wright <chrisw@redhat.com> 1.1.0-1
 - Update to latest git-1.1.0 (drop git-email for now)
 - Now creates multiple packages:
--	 git-core, git-svn, git-cvs, git-arch, gitk
+-        git-core, git-svn, git-cvs, git-arch, gitk
 
 * Mon Nov 14 2005 H. Peter Anvin <hpa@zytor.com> 0.99.9j-1
 - Change subpackage names to git-<name> instead of git-core-<name>
@@ -558,7 +564,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.99.4-3
 - use dist tag to differentiate between branches
 - use rpm optflags by default (patch0)
-- own %{_datadir}/git-core/
+- own %%{_datadir}/git-core/
 
 * Mon Aug 15 2005 Chris Wright <chrisw@osdl.org>
 - update spec file to fix Buildroot, Requires, and drop Vendor