Attachment 879856 Details for Bug 1082038 – Try "git am" first in "%autosetup -S git"

[patch] Try "git am" first in "%autosetup -S git"

0001-Try-git-am-first-in-autosetup-S-git.patch (text/plain), 1.79 KB, created by Michal Schmidt on 2014-03-28 14:17:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Schmidt

Created: 2014-03-28 14:17:36 UTC

Size: 1.79 KB

patch

obsolete

>From 0e8d120c65d8f60ec7403c55c79ef8e3186f36b2 Mon Sep 17 00:00:00 2001
>From: Michal Schmidt <mschmidt@redhat.com>
>Date: Fri, 28 Mar 2014 14:52:05 +0100
>Subject: [PATCH] Try "git am" first in "%autosetup -S git"
>
>- For properly git formatted patch files "git am" will preserve
>  authorship and commit message.
>---
> configure.ac |  1 +
> macros.in    | 12 ++++++++++--
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 9ff7e56..eb9351c 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -111,6 +111,7 @@ AC_PATH_PROG(__LZIP, lzip, /usr/bin/lzip, $MYPATH)
> AC_PATH_PROG(__XZ, xz, /usr/bin/xz, $MYPATH)
> AC_PATH_PROG(__MAKE, make, /usr/bin/make, $MYPATH)
> AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
>+AC_PATH_PROG(__MKTEMP, mktemp, /bin/mktemp, $MYPATH)
> AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
> AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
> AC_PATH_PROG(__RESTORECON, restorecon, /sbin/restorecon, $MYPATH)
>diff --git a/macros.in b/macros.in
>index ccb834f..663165f 100644
>--- a/macros.in
>+++ b/macros.in
>@@ -56,6 +56,7 @@
> %__make			@__MAKE@
> %__mkdir		@__MKDIR@
> %__mkdir_p		@__MKDIR_P@
>+%__mktemp		@__MKTEMP@
> %__mv			@__MV@
> %__patch		@__PATCH@
> %__perl			@__PERL@
>@@ -1075,8 +1076,15 @@ done \
> 	--author "%{__scm_author}" -m "%{name}-%{version} base"
> 
> %__scm_apply_git(qp:m:)\
>-%{__git} apply --index %{-p:-p%{-p*}} -\
>-%{__git} commit %{-q} -m %{-m*} --author "%{__scm_author}"
>+( PATCH_FILE="$(%{__mktemp} %{_tmppath}/rpm-tmp-patch.XXXXXXXXXX)"\
>+  %{__cat} - > "$PATCH_FILE"\
>+  %{__git} am %{-p:-p%{-p*}} "$PATCH_FILE" ||\
>+  ( %{__git} am --abort\
>+    %{__git} apply --index %{-p:-p%{-p*}} "$PATCH_FILE" &&\
>+    %{__git} commit %{-q} -m %{-m*} --author "%{__scm_author}"\
>+  )\
>+  %{__rm} "$PATCH_FILE"\
>+)
> 
> # Quilt
> %__scm_setup_quilt(q) %{nil}
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1082038: 879856 | 884001