[packages/vmips] - updated to 1.4 - added am patch (fixes build with automake 1.13) - added gcc patch (missing header

[qboosh]

commit 0dc158cddba710fc64a75dc3a2b4caa709d5a9e8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 27 13:37:31 2013 +0100

    - updated to 1.4
    - added am patch (fixes build with automake 1.13)
    - added gcc patch (missing header required by recent gcc/glibc)
    - added info patch (unify direntry)

 vmips-am.patch   | 11 +++++++++++
 vmips-gcc.patch  | 10 ++++++++++
 vmips-info.patch | 14 ++++++++++++++
 vmips.spec       | 23 ++++++++++++++++-------
 4 files changed, 51 insertions(+), 7 deletions(-)
---
diff --git a/vmips.spec b/vmips.spec
index 98425b1..dc0e074 100644
--- a/vmips.spec
+++ b/vmips.spec
@@ -1,15 +1,20 @@
 Summary:	Virtual machine simulator based on a MIPS R3000 processor
 Summary(pl.UTF-8):	Symulator maszyny wirtualnej opartej na procesorze MIPS R3000
 Name:		vmips
-Version:	1.3.1
+Version:	1.4
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		Applications/Emulators
 Source0:	http://vmips.sourceforge.net/releases/%{name}-%{version}/vmips-%{version}.tar.gz
-# Source0-md5:	882776097824ed5fe9eaf28220daceca
+# Source0-md5:	3ca24f11d61d3f0e8d92dd8a352029d4
+Patch0:		%{name}-am.patch
+Patch1:		%{name}-gcc.patch
+Patch2:		%{name}-info.patch
 URL:		http://vmips.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libstdc++-devel
+BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -24,9 +29,11 @@ C++ i jest rozpowszechniany na licencji GNU GPL.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-#%%{__gettextize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -46,9 +53,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/vmips
+%attr(755,root,root) %{_bindir}/vmipstool
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmipsrc
 %{_includedir}/%{name}
 %{_datadir}/%{name}
-%{_mandir}/*/vmips*
-%{_infodir}/vmips*
+%{_mandir}/man1/vmips.1*
+%{_mandir}/man1/vmipstool.1*
+%{_infodir}/vmips.info*
diff --git a/vmips-am.patch b/vmips-am.patch
new file mode 100644
index 0000000..92f8530
--- /dev/null
+++ b/vmips-am.patch
@@ -0,0 +1,11 @@
+--- vmips-1.4/configure.in.orig	2010-12-20 02:26:19.000000000 +0100
++++ vmips-1.4/configure.in	2013-01-27 12:04:13.500356297 +0100
+@@ -5,7 +5,7 @@
+ AC_CANONICAL_SYSTEM
+ program_prefix=NONE
+ AM_INIT_AUTOMAKE(vmips, 1.4)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl Look for mips tool installation:
+ AC_ARG_WITH(mips,
diff --git a/vmips-gcc.patch b/vmips-gcc.patch
new file mode 100644
index 0000000..18591ff
--- /dev/null
+++ b/vmips-gcc.patch
@@ -0,0 +1,10 @@
+--- vmips-1.4/clockdev.cc.orig	2004-12-09 09:48:04.000000000 +0100
++++ vmips-1.4/clockdev.cc	2013-01-27 13:20:00.420261525 +0100
+@@ -21,6 +21,7 @@
+ #include "devreg.h"
+ 
+ #include <cassert>
++#include <cstdlib>
+ 
+ ClockDevice::ClockDevice( Clock *clock, uint32 irq, long frequency_ns )
+ 	: DeviceMap(20), irq(irq), frequency_ns(frequency_ns),
diff --git a/vmips-info.patch b/vmips-info.patch
new file mode 100644
index 0000000..88cde15
--- /dev/null
+++ b/vmips-info.patch
@@ -0,0 +1,14 @@
+--- vmips-1.4/doc/vmips.texi.orig	2012-01-29 08:58:54.000000000 +0100
++++ vmips-1.4/doc/vmips.texi	2013-01-27 13:29:17.070249924 +0100
+@@ -6,9 +6,9 @@
+ @syncodeindex fn cp
+ @syncodeindex pg cp
+ 
+- at dircategory Development
++ at dircategory Software development:
+ @direntry
+-* VMIPS: (vmips).                A MIPS R3000 simulator.
++* VMIPS: (vmips).			A MIPS R3000 simulator
+ @end direntry
+ 
+ @ifinfo
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vmips.git/commitdiff/0dc158cddba710fc64a75dc3a2b4caa709d5a9e8