[git/f13/master] Update to 1.7.3.4.

Adam Tkac atkac at fedoraproject.org
Thu Dec 16 12:50:58 UTC 2010


commit 70460985dc76e0cf46d3b28f564b49066297111f
Author: Adam Tkac <atkac at redhat.com>
Date:   Thu Dec 16 13:49:51 2010 +0100

    Update to 1.7.3.4.
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore                 |    1 +
 git-1.7.2.1-730220de.patch |   86 --------------------------------------------
 git.spec                   |   10 +++---
 sources                    |    2 +-
 4 files changed, 7 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 99ca092..25f38ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 git-1.7.2.1.tar.bz2
 /git-1.7.2.2.tar.bz2
 /git-1.7.2.3.tar.bz2
+/git-1.7.3.4.tar.bz2
diff --git a/git.spec b/git.spec
index a679e27..83d0723 100644
--- a/git.spec
+++ b/git.spec
@@ -6,7 +6,7 @@
 %endif
 
 Name:           git
-Version:        1.7.2.3
+Version:        1.7.3.4
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -23,9 +23,6 @@ Patch0:         git-1.5-gitweb-home-link.patch
 Patch1:         git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
 # https://bugzilla.redhat.com/500137
 Patch2:         git-1.6-update-contrib-hooks-path.patch
-# Do not unquote + into ' ' in URLs
-# cherry-picked from upstream
-Patch3:         git-1.7.2.1-730220de.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -230,7 +227,6 @@ Requires:       emacs-git = %{version}-%{release}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # Use these same options for every invocation of 'make'.
 # Otherwise it will rebuild in %%install due to flags changes.
@@ -458,6 +454,10 @@ rm -rf %{buildroot}
 # No files for you!
 
 %changelog
+* Thu Dec 16 2010 Adam Tkac <atkac redhat com> - 1.7.3.4-1
+- update to 1.7.3.4
+  - git-1.7.2.1-730220de.patch merged
+
 * Tue Sep 07 2010 Adam Tkac <atkac redhat com> - 1.7.2.3-1
 - update to 1.7.2.3
 
diff --git a/sources b/sources
index 461cff7..f53a6a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d88c06f6442156686deb4b4fbab0954c  git-1.7.2.3.tar.bz2
+3a2602016f98c529cda7b9fad1a6e216  git-1.7.3.4.tar.bz2


More information about the scm-commits mailing list