SPECS: newt.spec - fixed tcl module install (bcond enabled by defa...

[qboosh]

Author: qboosh                       Date: Thu Sep 22 19:14:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed tcl module install (bcond enabled by default)
- removed useless aclocal call (and am BR)

---- Files affected:
SPECS:
   newt.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: SPECS/newt.spec
diff -u SPECS/newt.spec:1.76 SPECS/newt.spec:1.77
--- SPECS/newt.spec:1.76	Thu Sep 22 21:08:31 2005
+++ SPECS/newt.spec	Thu Sep 22 21:14:27 2005
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	python	# don't build Python module
-%bcond_with	tcl	# build Tcl module
+%bcond_without	python	# don't build Python module (note: needs patch to work)
+%bcond_without	tcl	# build Tcl module
 #
 Summary:	Not Erik's Windowing Toolkit - text mode windowing with slang
 Summary(de):	Nicht Eriks Windowing Toolkit - Textmodus-Windowing mit Slang
@@ -24,7 +24,6 @@
 Patch4:		%{name}-gcc34.patch
 URL:		http://www.msg.com.mx/Newt/
 BuildRequires:	autoconf
-BuildRequires:	automake
 BuildRequires:	popt-devel
 %{?with_python:BuildRequires:	python-devel >= 2.2}
 #BuildRequires:	sgml-tools
@@ -165,9 +164,9 @@
 %patch3 -p1
 %patch4 -p1
 
+sed -i -e 's#gcc#%{__cc}#g' Makefile.in
+
 %build
-sed -i -e 's#gcc#%{__cc}#g' Makefile*
-%{__aclocal}
 %{__autoconf}
 %configure \
 	--enable-gpm-support
@@ -180,6 +179,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	%{?with_tcl:WHIPTCLSO=whiptcl.so} \
 	instroot=$RPM_BUILD_ROOT \
 	libdir=%{_libdir} \
 	pythondir=%{py_sitedir} \
@@ -232,6 +232,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2005/09/22 19:14:27  qboosh
+- fixed tcl module install (bcond enabled by default)
+- removed useless aclocal call (and am BR)
+
 Revision 1.76  2005/09/22 19:08:31  qboosh
 - bcond descs, dropped outdated c_only patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/newt.spec?r1=1.76&r2=1.77&f=u