[xcircuit] Fix FTBFS rhbz #914582

[mbooth]

commit 3a59f9f19b590a4bdd47cef9c83d6f5eff78d2a6
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Mon Feb 25 10:34:20 2013 +0000

    Fix FTBFS rhbz #914582

 remove-AM_C_PROTOTYPES.patch |   10 ++++++++++
 xcircuit.spec                |   23 +++++++++++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/remove-AM_C_PROTOTYPES.patch b/remove-AM_C_PROTOTYPES.patch
new file mode 100644
index 0000000..7e56f90
--- /dev/null
+++ b/remove-AM_C_PROTOTYPES.patch
@@ -0,0 +1,10 @@
+--- xcircuit-3.7.44/configure.in.orig	2013-02-25 10:20:18.734890157 +0000
++++ xcircuit-3.7.44/configure.in	2013-02-25 10:20:26.918866098 +0000
+@@ -43,7 +43,6 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+ if test "x$U" != "x"; then
+   AC_MSG_ERROR(Compiler not ANSI compliant)
+ fi
diff --git a/xcircuit.spec b/xcircuit.spec
index 756acb4..3151040 100644
--- a/xcircuit.spec
+++ b/xcircuit.spec
@@ -1,6 +1,8 @@
+%global short_version 3.7
+
 Name:             xcircuit
-Version:          3.7.44
-Release:          5%{?dist}
+Version:          %{short_version}.44
+Release:          6%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
 License:          GPLv2
@@ -12,6 +14,9 @@ Source1:          %{name}.desktop
 # http://opencircuitdesign.com/xcircuit/archive/xcircuit.xpm as 64x64
 Source2:          %{name}.png
 
+# Remove obsolete macro that breaks build with automake >= 1.12
+Patch0:           remove-AM_C_PROTOTYPES.patch
+
 BuildRequires:    tk-devel, desktop-file-utils, libtool, libXt-devel, m4
 BuildRequires:    ghostscript-devel, ngspice, libXpm-devel, zlib-devel
 BuildRequires:    chrpath
@@ -30,6 +35,8 @@ CAD program for circuit schematic drawing and schematic capture.
 # create a directory and expand tarball there.
 %setup -q -T -c %{name}-%{version} -a 0
 
+%patch0 -p0 -b .orig
+
 #439604: TCL 8.5.1
 sed -i "s|package require -exact|package require|" %{name}-%{version}/lib/tcl/tkcon.tcl
 
@@ -66,12 +73,12 @@ rm -rf examples/win32
 #W: xcircuit hidden-file-or-dir examples/python/.xcircuitrc
 #W: xcircuit hidden-file-or-dir examples/.xcircuitrc
 
-chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.6/console.tcl
+chmod -x %{buildroot}%{_prefix}/lib*/%{name}-%{short_version}/console.tcl
 
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 cp -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
-sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.6/xcstartup.tcl
+sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-%{short_version}/xcstartup.tcl
 sed -i '7 a\export TCLLIBPATH=%{_libdir}' %{buildroot}%{_bindir}/xcircuit
 
 
@@ -80,7 +87,7 @@ desktop-file-install --vendor "" \
     %{SOURCE1}
 
 # removing rpath
-chrpath --delete %{buildroot}%{_libdir}/%{name}-3.6/xcircexec
+chrpath --delete %{buildroot}%{_libdir}/%{name}-%{short_version}/xcircexec
 
 
 %post
@@ -98,13 +105,17 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %doc %{name}-%{version}/{CHANGES,COPYRIGHT,README*,TODO}
 %doc %{name}-%{version}/examples/
 %{_bindir}/%{name}
-%{_prefix}/lib*/%{name}-3.6/
+%{_prefix}/lib*/%{name}-%{short_version}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Mon Feb 25 2013 Mat Booth <fedora at matbooth.co.uk> - 3.7.44-6
+- Remove obsoleted macro for automake >= 1.12
+- Fix FTBFS rhbz #914582
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.44-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild