[parallel/f19] Applied patch to makefile

Golo Fuchert golfu at fedoraproject.org
Thu Jun 13 19:59:46 UTC 2013


commit 3385f43b416bb69a03e80b521131a3f0dc5fbc3e
Author: golfu <packages at golotop.de>
Date:   Thu Jun 13 21:59:33 2013 +0200

    Applied patch to makefile

 .gitignore    |    1 +
 parallel.spec |    2 ++
 sources       |    1 +
 3 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43a76d6..0681032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /parallel-20130522-pod.patch
 >>>>>>> master
 /parallel-20130522-makefile.patch
+/parallel-20130522-makefile_in.patch
diff --git a/parallel.spec b/parallel.spec
index 068dddb..967a7ae 100644
--- a/parallel.spec
+++ b/parallel.spec
@@ -9,6 +9,7 @@ Source0:	http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 # Fedora-specific config file (compatibility with moreutils' parallel)
 Source1:	%{name}-config
 Patch0:		%{name}-%{version}-makefile.patch
+Patch1:		%{name}-%{version}-makefile_in.patch
 BuildArch:	noarch
 
 # Due to a naming conflict, both packages cannot be installed in parallel
@@ -40,6 +41,7 @@ additional features.
 
 %setup -q
 %patch0
+%patch1
 
 %build
 
diff --git a/sources b/sources
index 019357c..2c115a9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 42ab88dda406027d8d94ba2cdd84fbc3  parallel-20130522.tar.bz2
 bc65cebc55e95d1ef9aa6957dc50df9c  parallel-20130522-pod.patch
 10aa3fc31ee16e13f5ea3d44fdbf1e3b  parallel-20130522-makefile.patch
+c4cdebef3bf8831f9171b3ccac568b7e  parallel-20130522-makefile_in.patch


More information about the scm-commits mailing list