[isdn4k-utils] revert ARM arch exclusion, add simple patch to fix building on ARM, cleanup spec

[Peter Robinson]

commit 2e2ba54658582cc746927dd85bbdb1edc225bf7f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jul 21 09:25:06 2012 +0100

    revert ARM arch exclusion, add simple patch to fix building on ARM, cleanup spec

 isdn4k-fix-ipppd.patch |   23 +++++++++++++++++++++++
 isdn4k-utils.spec      |   15 ++++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/isdn4k-fix-ipppd.patch b/isdn4k-fix-ipppd.patch
new file mode 100644
index 0000000..ebe9e8e
--- /dev/null
+++ b/isdn4k-fix-ipppd.patch
@@ -0,0 +1,23 @@
+*** isdn4k-utils-CVS-2010-05-01-patched/ipppd.org/main.c	1969-12-31 20:03:58.571929416 -0500
+--- isdn4k-utils-CVS-2010-05-01-patched/ipppd/main.c	2012-07-18 05:46:07.636040971 -0400
+***************
+*** 1301,1309 ****
+           * XXX We assume a va_list is either a pointer or an array, so
+           * what gets passed for a va_list is like a void * in some sense.
+           */
+          a = va_arg(args, void *);
+! #if defined(__alpha__) || defined(__sh__)       /* always do this? */
+  	n = fmtmsg(buf, buflen + 1, f, a);
+  #else
+  	n = vfmtmsg(buf, buflen + 1, f, a);
+  #endif
+--- 1301,1309 ----
+           * XXX We assume a va_list is either a pointer or an array, so
+           * what gets passed for a va_list is like a void * in some sense.
+           */
+          a = va_arg(args, void *);
+! #if defined(__alpha__) || defined(__sh__) || defined ( __arm__ )      /* always do this? */
+  	n = fmtmsg(buf, buflen + 1, f, a);
+  #else
+  	n = vfmtmsg(buf, buflen + 1, f, a);
+  #endif
diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec
index e1f53e7..8387469 100644
--- a/isdn4k-utils.spec
+++ b/isdn4k-utils.spec
@@ -6,11 +6,10 @@
 Summary: Utilities for configuring an ISDN subsystem
 Name: isdn4k-utils
 Version: 3.2
-Release: 82%{?dist}
+Release: 84%{?dist}
 License: GPLv2+ and GPL+ and MIT and BSD and zlib
 Group: Applications/System
 Url: http://www.isdn4linux.de/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # license issue, remove the isdn_lzscomp.c and firmwares
 Source0: ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/isdn4k-utils-%{interver}-patched.tar.bz2
@@ -47,6 +46,7 @@ Patch20: isdn4k-utils-CVS-2010-05-01-capi.patch
 Patch21: isdn4k-utils-CVS-2010-05-01-capi-soname.patch
 Patch22: isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch
 Patch23: isdn-manpages.patch
+Patch24: isdn4k-fix-ipppd.patch
 
 Requires: udev >= 039-10.14.EL4
 Requires: hwdata >= 0.146.18.EL-1
@@ -153,6 +153,7 @@ popd
 %patch21 -p1 -b .capi-soname
 %patch22 -p1 -b .vboxgetty-config
 %patch23 -p0 -b .manpages
+%patch24 -p1 -b .fix-ipppd
 
 # remove useless files
 find -type d -name "CVS" | xargs rm -rf
@@ -200,8 +201,6 @@ gcc $RPM_OPT_FLAGS ibod/ibod.c -o ibod/ibod
 %endif
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}/dev \
          %{buildroot}/etc/{rc.d/init.d,ppp,isdn} \
          %{buildroot}/var/{log/vbox,spool/vbox,lock/isdn} \
@@ -324,9 +323,6 @@ triggerun -- %{name} < 3.2-77
 /sbin/chkconfig --del isdn >/dev/null 2>&1 || :
 /bin/systemctl try-restart isdn.service >/dev/null 2>&1 || :
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,755)
 %dir /etc/isdn
@@ -436,6 +432,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 20 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 3.2-84
+- revert ARM arch exclusion
+- add simple patch to fix building on ARM
+- cleanup spec
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-82
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild