walters pushed to docker (master). "Switch to %autosetup -Sgit (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 15 15:31:04 UTC 2015


>From 48d2dd6a882fe37e24930f8aebc7c910ef349bb8 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters at verbum.org>
Date: Wed, 15 Apr 2015 11:30:13 -0400
Subject: Switch to %autosetup -Sgit

1) avoids the "I added PatchN but forgot %patchN"
2) git am has some differences from GNU patch such as the ability to change file modes which matters

diff --git a/docker.spec b/docker.spec
index 79eb02b..15ce75a 100644
--- a/docker.spec
+++ b/docker.spec
@@ -56,6 +56,7 @@ Source6: %{repo}-network.sysconfig
 %if 0%{?fedora} >= 23
 Source7: https://github.com/fedora-cloud/%{repo}-selinux/archive/%{ds_commit}/%{repo}-selinux-%{ds_shortcommit}.tar.gz
 %endif
+BuildRequires: git
 BuildRequires: glibc-static
 BuildRequires: golang >= 1.3.3
 BuildRequires: go-md2man
@@ -252,7 +253,7 @@ Provides: %{repo}-io-zsh-completion = %{version}-%{release}
 This package installs %{summary}.
 
 %prep
-%setup -q -n %{repo}-%{d_commit}
+%autosetup -Sgit -n %{repo}-%{d_commit}
 cp %{SOURCE5} .
 
 %if 0%{?fedora} >= 23
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/docker.git/commit/?h=master&id=48d2dd6a882fe37e24930f8aebc7c910ef349bb8


More information about the scm-commits mailing list