From 6888d1d12bed5527669efc3da65ce32135834c645acd4f55035b69755a5cd8b3 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 8 Oct 2014 20:13:55 +0000
Subject: [PATCH] Accepting request 254639 from electronics

- Fix build with automake 1.14
  * gerbv-fix-install-sh-call.patch

OBS-URL: https://build.opensuse.org/request/show/254639
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gerbv?expand=0&rev=6
---
 gerbv-fix-install-sh-call.patch | 15 +++++++++++++++
 gerbv.changes                   |  6 ++++++
 gerbv.spec                      |  5 ++++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 gerbv-fix-install-sh-call.patch

diff --git a/gerbv-fix-install-sh-call.patch b/gerbv-fix-install-sh-call.patch
new file mode 100644
index 0000000..55286f6
--- /dev/null
+++ b/gerbv-fix-install-sh-call.patch
@@ -0,0 +1,15 @@
+Index: gerbv-2.6.1/configure.ac
+===================================================================
+--- gerbv-2.6.1.orig/configure.ac
++++ gerbv-2.6.1/configure.ac
+@@ -24,9 +24,9 @@ dnl  Foundation, Inc., 59 Temple Place,
+ 
+ AC_INIT([gerbv], [2.6.1])
+ AC_CONFIG_SRCDIR([src/gerbv.c])
+-AC_GNU_SOURCE
+ AC_PREREQ([2.59])
+ AM_INIT_AUTOMAKE([1.9])
++AC_GNU_SOURCE
+ 
+ dnl Create a configuration header 
+ AM_CONFIG_HEADER([config.h])
diff --git a/gerbv.changes b/gerbv.changes
index 9c9a188..d5d9864 100644
--- a/gerbv.changes
+++ b/gerbv.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  7 21:24:37 UTC 2014 - dmitry_r@opensuse.org
+
+- Fix build with automake 1.14
+  * gerbv-fix-install-sh-call.patch
+
 -------------------------------------------------------------------
 Tue Jul 23 09:34:34 UTC 2013 - dmitry_r@opensuse.org
 
diff --git a/gerbv.spec b/gerbv.spec
index 6fc35b8..07075ab 100644
--- a/gerbv.spec
+++ b/gerbv.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gerbv
 #
-# 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
@@ -30,6 +30,8 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Patch1:         gerbv-no-build-time.patch
 # PATCH-FIX-UPSTREAM gerbv-2.6.1-no-translation.patch -- disable translation due to missed files
 Patch2:         gerbv-2.6.1-no-translation.patch
+# PATCH-FIX-UPSTREAM gerbv-fix-install-sh-call.patch -- Fix calling install-sh not from build dir for automake 1.14 
+Patch3:         gerbv-fix-install-sh-call.patch
 BuildRequires:  autoconf
 BuildRequires:  gtk2-devel
 BuildRequires:  libpng-devel
@@ -72,6 +74,7 @@ that use gerbv library.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 ./autogen.sh