SPECS: lyx.spec - individual tools invocation instead of autogen.s...

[qboosh]

Author: qboosh                       Date: Mon Dec 18 12:17:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- individual tools invocation instead of autogen.sh
  (fixes build with ac 2.60/am 1.10, stops hiding errors)
- BR: autoconf 2.59-9 not to BR libXt-devel

---- Files affected:
SPECS:
   lyx.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: SPECS/lyx.spec
diff -u SPECS/lyx.spec:1.105 SPECS/lyx.spec:1.106
--- SPECS/lyx.spec:1.105	Sun Sep 24 19:03:44 2006
+++ SPECS/lyx.spec	Mon Dec 18 13:17:00 2006
@@ -14,10 +14,9 @@
 Source2:	%{name}.png
 Patch0:		%{name}-build.patch
 URL:		http://www.lyx.org/
-BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	aiksaurus-devel
 BuildRequires:	aspell-devel
-BuildRequires:	autoconf >= 2.52
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 BuildRequires:	libstdc++-devel
@@ -28,6 +27,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	tetex-fonts-type1-bluesky
 BuildRequires:	tetex-fonts-type1-hoekwater
+BuildRequires:	xorg-lib-libX11-devel
 Requires(post,postun):	tetex
 Requires:	gv
 Requires:	python-modules
@@ -70,8 +70,11 @@
 %{__perl} -pi -e 's/-lqt-mt -lqt-mt3 -lqt3 -lqt2 -lqt/-lqt-mt/' config/qt.m4
 
 %build
-./autogen.sh
-cp -f /usr/share/automake/config.* config
+cat config/{lyxinclude.m4,libtool.m4,xforms.m4,qt.m4,gtk--.m4,gnome--.m4,gnome.m4,spell.m4,lyxinclude25x.m4} > acinclude.m4
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 CXXFLAGS="%{rpmcflags} -fno-exceptions"
 %configure \
 	--enable-nls \
@@ -180,6 +183,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2006/12/18 12:17:00  qboosh
+- individual tools invocation instead of autogen.sh
+  (fixes build with ac 2.60/am 1.10, stops hiding errors)
+- BR: autoconf 2.59-9 not to BR libXt-devel
+
 Revision 1.105  2006/09/24 17:03:44  arekm
 - up to 1.4.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lyx.spec?r1=1.105&r2=1.106&f=u