rpms/eterm/devel Eterm-0.9.4-automake-1.10.patch, NONE, 1.1 eterm.spec, 1.2, 1.3

[Terje Røsten (terjeros)]

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26581

Modified Files:
	eterm.spec 
Added Files:
	Eterm-0.9.4-automake-1.10.patch 
Log Message:
Add patch to build with autmake-1.10.



Eterm-0.9.4-automake-1.10.patch:

--- NEW FILE Eterm-0.9.4-automake-1.10.patch ---
diff -uNr -x '*~' Eterm-0.9.4.orig/configure.in Eterm-0.9.4/configure.in
--- Eterm-0.9.4.orig/configure.in	2006-01-04 09:44:14.000000000 +0100
+++ Eterm-0.9.4/configure.in	2006-11-26 16:06:19.000000000 +0100
@@ -91,6 +91,9 @@
     CFLAGS="$CCOPTS"
 fi
 
+dnl# required from automake-1.10 
+AM_PROG_AS
+
 AC_ARG_WITH(cc, [  --with-cc=compiler      force Eterm to build with a particular compiler (like pgcc, egcs, etc.)], [
             CC=$withval, 
   if test -z "$CC"; then


Index: eterm.spec
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/eterm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eterm.spec	25 Nov 2006 22:18:52 -0000	1.2
+++ eterm.spec	26 Nov 2006 15:31:15 -0000	1.3
@@ -1,18 +1,19 @@
 Summary: Enlightened terminal emulator
 Name: eterm
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: User Interface/Desktops
 Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
 Source1: http://www.eterm.org/download/Eterm-bg-0.9.4.tar.gz
 Source2: %{name}.png
-Patch: Eterm-0.9.4-no-rpath.patch
+Patch1: Eterm-0.9.4-no-rpath.patch
+Patch2: Eterm-0.9.4-automake-1.10.patch
 URL: http://www.eterm.org/
 Requires: imlib2
 BuildRequires: imlib2-devel libast-devel libXmu-devel 
 BuildRequires: pcre-devel desktop-file-utils
-BuildRequires: /usr/bin/automake-1.9 autoconf libtool
+BuildRequires: autoconf automake libtool
 Provides: Eterm = %{version}-%{release}
 Obsoletes: Eterm <= 0.9.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,12 +28,11 @@
 
 %prep
 %setup -a 1 -q -n Eterm-%{version}
-%patch -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 # Touching Makefile.am
-# Need automake 1.9
-export AUTOMAKE=/usr/bin/automake-1.9
 ./autogen.sh
 %configure --enable-multi-charset \
            --enable-escreen       \
@@ -41,7 +41,7 @@
            --disable-etwin        \
            --disable-mmx
 
-%{__make}
+%{__make} %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -98,6 +98,10 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Nov 26 2006 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-4
+- Add patch to build with automake-1.10
+- Add smp flags to make
+
 * Sat Nov 25 2006 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-3
 - Use automake-1.9