Attachment 295744 Details for Bug 433255 – updated patch to add a git-completion subpackage and fix some rpmlint warnings.

[patch] updated patch to add a git-completion subpackage and fix some rpmlint warnings.

git-add-bash-completion-subpackage.patch (text/plain), 2.32 KB, created by Todd Zullinger on 2008-02-24 18:05:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Zullinger

Created: 2008-02-24 18:05:02 UTC

Size: 2.32 KB

patch

obsolete

>? git-1.5.4.1
>? git-1.5.4.1-3.fc8
>? git-1.5.4.1.tar.gz
>? git-1.5.4.2.tar.gz
>Index: git.spec
>===================================================================
>RCS file: /cvs/extras/rpms/git/devel/git.spec,v
>retrieving revision 1.55
>diff -u -p -b -r1.55 git.spec
>--- git.spec	24 Feb 2008 14:57:54 -0000	1.55
>+++ git.spec	24 Feb 2008 17:27:41 -0000
>@@ -1,7 +1,7 @@
> # Pass --without docs to rpmbuild if you don't want the documentation
> Name: 		git
> Version: 	1.5.4.3
>-Release: 	2%{?dist}
>+Release:        3%{?dist}
> Summary:  	Core git tools
> License: 	GPLv2
> Group: 		Development/Tools
>@@ -126,6 +126,13 @@ Requires:      git = %{version}-%{releas
> %description -n emacs-git
> %{summary}.
> 
>+%package completion
>+Summary:        Bash completion for git
>+Group:          Development/Tools
>+Requires:       git-core = %{version}-%{release}, bash-completion
>+%description completion
>+Bash completion for git.
>+
> %prep
> %setup -q
> %patch0 -p1
>@@ -172,6 +179,14 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}
> %endif
> mkdir -p $RPM_BUILD_ROOT/srv/git
> 
>+# remove some cruft we don't need to end up in the gitweb docs
>+rm -rf Documentation/technical/{.gitignore,api-index.sh}
>+
>+# bash completion
>+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
>+install -m 644 -p contrib/completion/git-completion.bash \
>+    $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
>+
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>@@ -252,7 +267,17 @@ rm -rf $RPM_BUILD_ROOT
> %files all
> # No files for you!
> 
>+%files completion
>+%defattr(-,root,root)
>+%config(noreplace)%{_sysconfdir}/bash_completion.d/git
>+
> %changelog
>+* Sun Feb 24 2008 Todd Zullinger <tmz@pobox.com> 1.5.4.3-3
>+- add git-completion subpackage for bash completion
>+- quiet some minor rpmlint warnings:
>+    git.spec: mixed-use-of-spaces-and-tabs and macro-in-changelog
>+    gitweb: version-control-internal-file and spurious-executable-perm
>+
> * Sun Feb 24 2008 Bernardo Innocenti <bernie@codewiz.org> 1.5.4.3-2
> - Do not silently overwrite /etc/httpd/conf.d/git.conf
> 
>@@ -473,7 +498,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

Actions: View | Diff

Attachments on bug 433255: 295137 | 295722 | 295744 | 298305