rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.8.2

Browse Source 
- 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch has been merged

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2013-03-19 18:01:03 +01:00
parent 83fc4ea137
commit 2035ea87cb
3 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-DESTDIR-support-in-contrib-subtree-Makefile.patch
View File

@ -1,32 +0,0 @@
From 02b6c8d3c07e3ca9aa091d4a865fe036e1794cbd Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Thu, 29 Nov 2012 16:18:03 +0100
Subject: [PATCH] DESTDIR support in contrib/subtree/Makefile
Signed-off-by: Adam Tkac <atkac@redhat.com>
---
contrib/subtree/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 05cdd5c..36ae3e4 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -30,12 +30,12 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
doc: $(GIT_SUBTREE_DOC)
install: $(GIT_SUBTREE)
- $(INSTALL) -m 755 $(GIT_SUBTREE) $(libexecdir)
+ $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir)
install-doc: install-man
install-man: $(GIT_SUBTREE_DOC)
- $(INSTALL) -m 644 $^ $(man1dir)
+ $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
xmlto -m $(MANPAGE_NORMAL_XSL) man $^
--
1.8.0.1

10
git.spec
View File

@ -35,8 +35,8 @@
%endif %endif
Name: git Name: git
Version: 1.8.1.4 Version: 1.8.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: Fast Version Control System Summary: Fast Version Control System
License: GPLv2 License: GPLv2
Group: Development/Tools Group: Development/Tools
@ -54,7 +54,6 @@ Patch0: git-1.5-gitweb-home-link.patch
Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
# https://bugzilla.redhat.com/600411 # https://bugzilla.redhat.com/600411
Patch3: git-1.7-el5-emacs-support.patch Patch3: git-1.7-el5-emacs-support.patch
Patch4: 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch
Patch5: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch Patch5: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -260,7 +259,6 @@ Requires: emacs-git = %{version}-%{release}
%if %{emacs_old} %if %{emacs_old}
%patch3 -p1 %patch3 -p1
%endif %endif
%patch4 -p1
%patch5 -p1 %patch5 -p1
%if %{use_prebuilt_docs} %if %{use_prebuilt_docs}
@ -545,6 +543,10 @@ rm -rf %{buildroot}
# No files for you! # No files for you!
%changelog %changelog
* Tue Mar 19 2013 Adam Tkac <atkac redhat com> - 1.8.2-1
- update to 1.8.2
- 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch has been merged
* Tue Feb 26 2013 Todd Zullinger <tmz@pobox.com> - 1.8.1.4-2 * Tue Feb 26 2013 Todd Zullinger <tmz@pobox.com> - 1.8.1.4-2
- Update asciidoc requirements, drop unsupported ASCIIDOC7 - Update asciidoc requirements, drop unsupported ASCIIDOC7
- Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) - Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works)

6
sources
View File

@ -1,3 +1,3 @@
60f32ef4a6b3fa2143b81a28704333ed git-1.8.1.4.tar.gz 210834d73c857931c3da34a65eb3e597 git-1.8.2.tar.gz
d41cf9afd408246f5da123482d4ff744 git-htmldocs-1.8.1.4.tar.gz fb7347ac4ac5152090fb0bda601963e5 git-htmldocs-1.8.2.tar.gz
61d19a9d386c686ee06b493a9df6e61c git-manpages-1.8.1.4.tar.gz 425e9421a1b128cfb46fa46d94cad919 git-manpages-1.8.2.tar.gz