From 2035ea87cbf4131865bb57e6eaf22b2a36a7c3c9 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 19 Mar 2013 18:01:03 +0100 Subject: [PATCH] Update to 1.8.2 - 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch has been merged Signed-off-by: Adam Tkac --- ...-support-in-contrib-subtree-Makefile.patch | 32 ------------------- git.spec | 10 +++--- sources | 6 ++-- 3 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch diff --git a/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch b/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch deleted file mode 100644 index b62c620..0000000 --- a/0001-DESTDIR-support-in-contrib-subtree-Makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 02b6c8d3c07e3ca9aa091d4a865fe036e1794cbd Mon Sep 17 00:00:00 2001 -From: Adam Tkac -Date: Thu, 29 Nov 2012 16:18:03 +0100 -Subject: [PATCH] DESTDIR support in contrib/subtree/Makefile - -Signed-off-by: Adam Tkac ---- - 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 - diff --git a/git.spec b/git.spec index d68ee5e..ad635e3 100644 --- a/git.spec +++ b/git.spec @@ -35,8 +35,8 @@ %endif Name: git -Version: 1.8.1.4 -Release: 2%{?dist} +Version: 1.8.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 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 # https://bugzilla.redhat.com/600411 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -260,7 +259,6 @@ Requires: emacs-git = %{version}-%{release} %if %{emacs_old} %patch3 -p1 %endif -%patch4 -p1 %patch5 -p1 %if %{use_prebuilt_docs} @@ -545,6 +543,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Mar 19 2013 Adam Tkac - 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 - 1.8.1.4-2 - Update asciidoc requirements, drop unsupported ASCIIDOC7 - Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) diff --git a/sources b/sources index 8ffcf44..f4eeea2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -60f32ef4a6b3fa2143b81a28704333ed git-1.8.1.4.tar.gz -d41cf9afd408246f5da123482d4ff744 git-htmldocs-1.8.1.4.tar.gz -61d19a9d386c686ee06b493a9df6e61c git-manpages-1.8.1.4.tar.gz +210834d73c857931c3da34a65eb3e597 git-1.8.2.tar.gz +fb7347ac4ac5152090fb0bda601963e5 git-htmldocs-1.8.2.tar.gz +425e9421a1b128cfb46fa46d94cad919 git-manpages-1.8.2.tar.gz