[ktechlab] Fix FTBFS with automake-1.14, gpsim-0.27 (#1107080)

[Yaakov Selkowitz]

commit 5d7d33cfb1add841080e1e81aaf916ac0e9d2971
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Wed Jun 18 17:00:40 2014 -0500

    Fix FTBFS with automake-1.14, gpsim-0.27 (#1107080)

 ktechlab-autotools.patch  |    2 +-
 ktechlab-gpsim-0.27.patch |   15 +++++++++++++++
 ktechlab.spec             |    8 +++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/ktechlab-autotools.patch b/ktechlab-autotools.patch
index 4e644ae..6321130 100644
--- a/ktechlab-autotools.patch
+++ b/ktechlab-autotools.patch
@@ -5,7 +5,7 @@
      exit 1
      ;;
 -  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;
diff --git a/ktechlab-gpsim-0.27.patch b/ktechlab-gpsim-0.27.patch
new file mode 100644
index 0000000..c6e391c
--- /dev/null
+++ b/ktechlab-gpsim-0.27.patch
@@ -0,0 +1,15 @@
+Based on upstream commit b520a28
+
+diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp
+index 16398f9..b551354 100644
+--- a/src/electronics/gpsimprocessor.cpp
++++ b/src/electronics/gpsimprocessor.cpp
+@@ -742,7 +742,7 @@ RegisterSet::RegisterSet( pic_processor * picProcessor )
+ 		m_nameToRegisterMap[ info->name() ] = info;
+ 	}
+ 	
+-	RegisterInfo * info = new RegisterInfo( picProcessor->W );
++	RegisterInfo * info = new RegisterInfo( picProcessor->Wreg );
+ 	m_registers.append( info );
+ 	m_nameToRegisterMap[ info->name() ] = info;
+ }
diff --git a/ktechlab.spec b/ktechlab.spec
index b1e2f7c..62710cb 100644
--- a/ktechlab.spec
+++ b/ktechlab.spec
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3.70
-Release:          12.20090304svn%{?dist}
+Release:          13.20090304svn%{?dist}
 # revision checkout 238
 
 Summary:          Development and simulation of micro-controllers and electronic circuits
@@ -15,6 +15,7 @@ Patch0:           ktechlab-0.3.6-multilib.patch
 Patch1:           ktechlab-detect_gpsim.patch
 Patch2:           ktechlab-gcc-4.5.patch
 Patch3:           ktechlab-autotools.patch
+Patch4:           ktechlab-gpsim-0.27.patch
 
 BuildRequires:    gpsim-devel readline-devel kdelibs3-devel
 BuildRequires:    desktop-file-utils autoconf automake
@@ -49,6 +50,7 @@ chmod +x ./admin/detect-autoconf.pl
 # GCC 4.5 and newer automake compatibility TODO: send upstream
 %patch2 -p0 -b .orig
 %patch3 -p0 -b .orig
+%patch4 -p1 -b .gpsim027
 
 # /usr/bin/install: will not overwrite just-created
 %{__sed} -i "s|while.png for.png||" icons/pics/Makefile.am
@@ -108,6 +110,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_sysconfdir}/profile.d/%{name}.sh
 
 %Changelog
+* Wed Jun 14 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.3.70-13.20090304svn
+- Update autotools patch for automake-1.14
+- Fix FTBFS with gpsim-0.27 (#1107080)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.70-12.20090304svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild