Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2014-01-17 11:03:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2013-12-19 12:10:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2014-01-23 15:43:45.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 14 15:19:17 UTC 2014 - [email protected] + +- Package the git subtree command +- Add 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch - to + fix install paths for git-subtree + + +------------------------------------------------------------------- New: ---- 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.qJbCy5/_old 2014-01-23 15:43:46.000000000 +0100 +++ /var/tmp/diff_new_pack.qJbCy5/_new 2014-01-23 15:43:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package git # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,6 +43,7 @@ Patch6: git-tcsh-completion-fixes.diff # adapt paths in zsh completion (bnc#853183) Patch7: git-zsh-completion-fixes.diff +Patch8: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2 BuildRequires: asciidoc @@ -194,6 +195,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build cat > .make <<'EOF' @@ -217,6 +219,8 @@ ./.make all %{?_smp_mflags} %{!?_without_docs: ./.make doc} +./.make -C contrib/subtree/ + %install ./.make install %{!?_without_docs: install-doc} ### git-web @@ -238,6 +242,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon ### +./.make -C contrib/subtree install +%{!?_without_docs: ./.make -C contrib/subtree install-doc} install -m 755 -D contrib/remote-helpers/git-remote-bzr $RPM_BUILD_ROOT%{gitexecdir} install -m 755 -D contrib/remote-helpers/git-remote-hg $RPM_BUILD_ROOT%{gitexecdir} (find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files ++++++ 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch ++++++ >From a906459c2a89938e911f1650e6ce22315a1ec84d Mon Sep 17 00:00:00 2001 From: Todd Zullinger <[email protected]> Date: Fri, 4 Jan 2013 11:54:21 -0500 Subject: [PATCH] git-subtree: Use gitexecdir instead of libexecdir When the git subtree Makefile includes config.mak from the toplevel, it's useful to have the same variables set globally applied. Using gitexecdir instead of libexecdir respects the global settings more consistently. Remove the unused gitdir variable as well. --- contrib/subtree/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 435b2de..dc8da19 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -2,9 +2,8 @@ -include ../../config.mak prefix ?= /usr/local +gitexecdir ?= $(prefix)/libexec/git-core mandir ?= $(prefix)/share/man -libexecdir ?= $(prefix)/libexec/git-core -gitdir ?= $(shell git --exec-path) man1dir ?= $(mandir)/man1 gitver ?= $(word 3,$(shell git --version)) @@ -30,8 +29,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML) install: $(GIT_SUBTREE) - $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir) - $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) + $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir) + $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir) install-doc: install-man -- 1.8.3.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
