Attachment 295722 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), 7.99 KB, created by Todd Zullinger on 2008-02-23 23:31:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Zullinger

Created: 2008-02-23 23:31:52 UTC

Size: 7.99 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.54
>diff -u -p -r1.54 git.spec
>--- git.spec	23 Feb 2008 22:44:40 -0000	1.54
>+++ git.spec	23 Feb 2008 23:30:20 -0000
>@@ -1,24 +1,24 @@
> # Pass --without docs to rpmbuild if you don't want the documentation
>-Name: 		git
>-Version: 	1.5.4.3
>-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.gz
>-Source1:	git-init.el
>-Source2:	git.xinetd
>-Source3:	git.conf.httpd
>-Patch0:		git-1.5-gitweb-home-link.patch
>-Patch1:		git-gitweb-commitdiff.patch
>-BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-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, curl, less, openssh-clients, expat, perl(Error)
>-Provides:	git-core = %{version}-%{release}
>-Obsoletes:	git-core <= 1.5.4.2
>+Name:           git
>+Version:        1.5.4.3
>+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.gz
>+Source1:        git-init.el
>+Source2:        git.xinetd
>+Source3:        git.conf.httpd
>+Patch0:         git-1.5-gitweb-home-link.patch
>+Patch1:         git-gitweb-commitdiff.patch
>+BuildRequires:  zlib-devel >= 1.2, openssl-devel, curl-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, curl, less, openssh-clients, expat, perl(Error)
>+Provides:       git-core = %{version}-%{release}
>+Obsoletes:      git-core <= 1.5.4.2
> 
> %description
> Git is a fast, scalable, distributed revision control system with an
>@@ -30,18 +30,18 @@ install all git packages, including tool
> 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.2
>+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.2
> 
> %description all
> Git is a fast, scalable, distributed revision control system with an
>@@ -51,9 +51,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-core = %{version}-%{release}
>+Summary:        Git protocol dÃ¦mon
>+Group:          Development/Tools
>+Requires:       git-core = %{version}-%{release}
> %description daemon
> The git dÃ¦mon for supporting git:// access to git repositories
> 
>@@ -90,7 +90,7 @@ Git tools for importing Arch repositorie
> %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.
> 
>@@ -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
>@@ -144,13 +151,13 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLA
>      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
>@@ -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
> 
>@@ -245,14 +260,25 @@ rm -rf $RPM_BUILD_ROOT
> %files -n gitweb
> %defattr(-,root,root)
> /var/www/git/
>-%{_sysconfdir}/httpd/conf.d/git.conf
>+%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
> %{!?_without_docs: %doc Documentation/*.html Documentation/howto}
> %{!?_without_docs: %doc Documentation/technical}
> 
> %files all
> # No files for you!
> 
>+%files completion
>+%defattr(-,root,root)
>+%config(noreplace)%{_sysconfdir}/bash_completion.d/git
>+
> %changelog
>+* Sat Feb 23 2008 Todd Zullinger <tmz@pobox.com> 1.5.4.3-2
>+- add git-completion subpackage for bash completion
>+- mark gitweb config as %%config(noreplace)
>+- 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
>+
> * Sat Feb 23 2008 James Bowes <jbowes@redhat.com> 1.5.4.3-1
> - git-1.5.4.3
> - Include Kristian HÃ¸gsberg's changes to rename git-core to
>@@ -262,7 +288,7 @@ rm -rf $RPM_BUILD_ROOT
> - git-1.5.4.2
> 
> * Mon Feb 11 2008 Jeremy Katz <katzj@redhat.com> - 1.5.4.1-2
>-- Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have 
>+- Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have
>   gitweb rss feeds point be commitdiffs instead of commit
> 
> * Sun Feb 10 2008 James Bowes <jbowes@redhat.com> 1.5.4.1-1
>@@ -433,7 +459,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>
>@@ -470,7 +496,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