Attachment 315175 Details for Bug 460414 – patch to update git to 1.6.0.1

[patch] patch to update git to 1.6.0.1

0001-Update-to-git-1.6.0.1.patch (text/plain), 3.82 KB, created by Todd Zullinger on 2008-08-28 06:25:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Zullinger

Created: 2008-08-28 06:25:53 UTC

Size: 3.82 KB

patch

obsolete

>From 5123458a838fa3c48080827a6a51abd615da4a15 Mon Sep 17 00:00:00 2001
>From: Todd Zullinger <tmz@pobox.com>
>Date: Wed, 27 Aug 2008 23:52:33 -0400
>Subject: [PATCH] Update to git-1.6.0.1
>
>---
> .cvsignore |    2 +-
> git.spec   |   21 +++++++++++++--------
> sources    |    2 +-
> 3 files changed, 15 insertions(+), 10 deletions(-)
>
>diff --git a/.cvsignore b/.cvsignore
>index 2d8c288..e4b6d52 100644
>--- a/.cvsignore
>+++ b/.cvsignore
>@@ -1 +1 @@
>-git-1.5.6.4.tar.bz2
>+git-1.6.0.1.tar.bz2
>diff --git a/git.spec b/git.spec
>index 4ab0248..6c8d23e 100644
>--- a/git.spec
>+++ b/git.spec
>@@ -1,6 +1,6 @@
> # Pass --without docs to rpmbuild if you don't want the documentation
> Name: 		git
>-Version: 	1.5.6.4
>+Version: 	1.6.0.1
> Release: 	1%{?dist}
> Summary:  	Core git tools
> License: 	GPLv2
>@@ -162,6 +162,7 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
> find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
> 
> (find $RPM_BUILD_ROOT%{_bindir} -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%{_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
>@@ -181,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT
> %files -f bin-man-doc-files
> %defattr(-,root,root)
> %{_datadir}/git-core/
>+%dir %{_libexecdir}/git-core/
> %doc README COPYING Documentation/*.txt contrib/hooks
> %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
> %{!?_without_docs: %doc Documentation/howto Documentation/technical}
>@@ -189,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT
> 
> %files svn
> %defattr(-,root,root)
>-%{_bindir}/*svn*
>+%{_libexecdir}/git-core/*svn*
> %doc Documentation/*svn*.txt
> %{!?_without_docs: %{_mandir}/man1/*svn*.1*}
> %{!?_without_docs: %doc Documentation/*svn*.html }
>@@ -197,28 +199,28 @@ rm -rf $RPM_BUILD_ROOT
> %files cvs
> %defattr(-,root,root)
> %doc Documentation/*git-cvs*.txt
>-%{_bindir}/*cvs*
>+%{_libexecdir}/git-core/*cvs*
> %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
> %{!?_without_docs: %doc Documentation/*git-cvs*.html }
> 
> %files arch
> %defattr(-,root,root)
> %doc Documentation/git-archimport.txt
>-%{_bindir}/git-archimport
>+%{_libexecdir}/git-core/git-archimport
> %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
> %{!?_without_docs: %doc Documentation/git-archimport.html }
> 
> %files email
> %defattr(-,root,root)
> %doc Documentation/*email*.txt
>-%{_bindir}/*email*
>+%{_libexecdir}/git-core/*email*
> %{!?_without_docs: %{_mandir}/man1/*email*.1*}
> %{!?_without_docs: %doc Documentation/*email*.html }
> 
> %files gui
> %defattr(-,root,root)
>-%{_bindir}/git-gui
>-%{_bindir}/git-citool
>+%{_libexecdir}/git-core/git-gui
>+%{_libexecdir}/git-core/git-citool
> %{_datadir}/git-gui/
> %{!?_without_docs: %{_mandir}/man1/git-gui.1*}
> %{!?_without_docs: %doc Documentation/git-gui.html}
>@@ -243,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
> 
> %files daemon
> %defattr(-,root,root)
>-%{_bindir}/git-daemon
>+%{_libexecdir}/git-core/git-daemon
> %config(noreplace)%{_sysconfdir}/xinetd.d/git
> /srv/git
> 
>@@ -257,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT
> # No files for you!
> 
> %changelog
>+* Wed Aug 27 2008 Todd Zullinger <tmz@pobox.com> 1.6.0.1-1
>+- git-1.6.0.1
>+
> * Thu Jul 24 2008 James Bowes <jbowes@redhat.com> 1.5.6-4
> - git-1.5.6.4
> 
>diff --git a/sources b/sources
>index e38b97c..ce81aef 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-b5f248c71d32921ff0ff7e35f7770003  git-1.5.6.4.tar.bz2
>+264701ebd9036ca2458358f01aa6c093  git-1.6.0.1.tar.bz2
>-- 
>1.6.0
>

Actions: View | Diff

Attachments on bug 460414: 315175 | 315176 | 315177