Attachment 315177 Details for Bug 460414 – patch to quiet a few rpmlint complaints

[patch] patch to quiet a few rpmlint complaints

0003-Quiet-a-number-of-rpmlint-complaints.patch (text/plain), 7.69 KB, created by Todd Zullinger on 2008-08-28 06:27:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Zullinger

Created: 2008-08-28 06:27:49 UTC

Size: 7.69 KB

patch

obsolete

>From 8444c6f3b3fa91adc7b571e772a04d84b9c8a3c1 Mon Sep 17 00:00:00 2001
>From: Todd Zullinger <tmz@pobox.com>
>Date: Wed, 27 Aug 2008 23:53:36 -0400
>Subject: [PATCH] Quiet a number of rpmlint complaints
>
>---
> git.spec |  100 +++++++++++++++++++++++++++++++------------------------------
> 1 files changed, 51 insertions(+), 49 deletions(-)
>
>diff --git a/git.spec b/git.spec
>index b17f9da..bb47e19 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.1
>-Release: 	1%{?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.1
>+Release:        1%{?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,7 +89,7 @@ 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:       git = %{version}-%{release}, perl-Git = %{version}-%{release}
> %description email
> Git tools for sending email.
> 
>@@ -118,9 +118,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}.
>@@ -138,17 +138,17 @@ 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} \
>-     ETC_GITCONFIG=/etc/gitconfig \
>-     INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
>+    prefix=%{_prefix} mandir=%{_mandir} \
>+    ETC_GITCONFIG=/etc/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/%{_sysconfdir}/xinetd.d
> install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git
> mkdir -p $RPM_BUILD_ROOT/var/www/git
>@@ -174,6 +174,9 @@ mkdir -p $RPM_BUILD_ROOT/srv/git
> mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
> install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
> 
>+# quiet some rpmlint complaints
>+rm -f Documentation/technical/.gitignore
>+chmod a-x Documentation/technical/api-index.sh
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -188,7 +191,6 @@ rm -rf $RPM_BUILD_ROOT
> %{!?_without_docs: %doc Documentation/howto Documentation/technical}
> %{_sysconfdir}/bash_completion.d
> 
>-
> %files svn
> %defattr(-,root,root)
> %{_libexecdir}/git-core/*svn*
>@@ -254,7 +256,6 @@ rm -rf $RPM_BUILD_ROOT
> /var/www/git/
> %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
> 
>-
> %files all
> # No files for you!
> 
>@@ -262,6 +263,7 @@ rm -rf $RPM_BUILD_ROOT
> * Wed Aug 27 2008 Todd Zullinger <tmz@pobox.com> 1.6.0.1-1
> - git-1.6.0.1
> - Drop curl requirement, rename curl-devel to libcurl-devel (bug 449388)
>+- Quiet a number of rpmlint complaints
> 
> * Thu Jul 24 2008 James Bowes <jbowes@redhat.com> 1.5.6-4
> - git-1.5.6.4
>@@ -493,7 +495,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>
>@@ -530,7 +532,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
>-- 
>1.6.0
>

Actions: View | Diff

Attachments on bug 460414: 315175 | 315176 | 315177