diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2009-01-29 16:37:35 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2009-01-29 16:37:35 +0000 |
| commit | 79912f91c32cd7cd7febc9050a7aab05f9d15725 (patch) | |
| tree | 05eb14709ae3273e8d13a7383ff2827b282176f3 | |
| parent | a555ff1fb84bc14594000c1f933d13882c2bb4fe (diff) | |
| download | rpm-setup-79912f91c32cd7cd7febc9050a7aab05f9d15725.tar rpm-setup-79912f91c32cd7cd7febc9050a7aab05f9d15725.tar.gz rpm-setup-79912f91c32cd7cd7febc9050a7aab05f9d15725.tar.bz2 rpm-setup-79912f91c32cd7cd7febc9050a7aab05f9d15725.tar.xz rpm-setup-79912f91c32cd7cd7febc9050a7aab05f9d15725.zip | |
- call patch with -U (aka --unified-reject-files)
| -rw-r--r-- | build.macros.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build.macros.in b/build.macros.in index 15bfa83..500020f 100644 --- a/build.macros.in +++ b/build.macros.in @@ -10,7 +10,7 @@ # when %_with_git_repository is set, these macros modify the behaviour of "%prep" step: %_after_setup %{?_with_git_repository:GIT_URL="%{?git_url}" GIT_REPOSITORY_CACHE=%{?git_repository_cache} @RPMVENDORDIR@/git-repository--after-tarball} -%_patch %{?_with_git_repository:PKG_NAME=%{name} @RPMVENDORDIR@/git-repository--apply-patch}%{?!_with_git_repository:%__patch} +%_patch %{?_with_git_repository:PKG_NAME=%{name} @RPMVENDORDIR@/git-repository--apply-patch}%{?!_with_git_repository:%__patch -U} # used by "git-repository--after-tarball": %git_repository_cache %_topdir/%{name}.git |