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

Update to 1.8.0.1

Browse Source 
- include git-subtree in git rpm (#864651)

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2012-11-29 15:17:58 +01:00
parent 8c6dafd613
commit a525ecd701
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,32 @@
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

13
git.spec
View File

@ -77,7 +77,7 @@
%endif
Name: git
Version: 1.8.0
Version: 1.8.0.1
Release: 1%{?dist}
Summary: Fast Version Control System
License: GPLv2
@ -94,6 +94,7 @@ Patch0: git-1.5-gitweb-home-link.patch
Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
# https://bugzilla.redhat.com/600411
Patch3: git-1.7-el5-emacs-support.patch
Patch4: 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -327,6 +328,7 @@ Requires: emacs-git = %{version}-%{release}
%if %{emacs_old}
%patch3 -p1
%endif
%patch4 -p1
# Use these same options for every invocation of 'make'.
# Otherwise it will rebuild in %%install due to flags changes.
@ -380,6 +382,8 @@ make -C contrib/emacs
make -C contrib/credential/gnome-keyring/
%endif
make -C contrib/subtree/
# Remove shebang from bash-completion script
sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash
@ -408,6 +412,9 @@ install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
%{buildroot}%{gitcoredir}
%endif
make -C contrib/subtree install
make -C contrib/subtree install-doc
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf
sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \
@ -599,6 +606,10 @@ rm -rf %{buildroot}
# No files for you!
%changelog
* Thu Nov 29 2012 Adam Tkac <atkac redhat com> - 1.8.0.1-1
- update to 1.8.0.1
- include git-subtree in git rpm (#864651)
* Mon Oct 29 2012 Adam Tkac <atkac redhat com> - 1.8.0-1
- update to 1.8.0
- include git-credential-gnome-keyring helper in git pkg

2
sources
View File

@ -1 +1 @@
12f4d20f34ae37086d86dd3b9d037bba git-1.8.0.tar.gz
3d598a31bd8ff04f6a72c65a4cd015a8 git-1.8.0.1.tar.gz