rpms/ngspice/F-11 ngspice-rework-20-compatmode.h, NONE, 1.1 import.log, 1.5, 1.6 ngspice.spec, 1.20, 1.21

[Chitlesh GOORAH]

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3236/F-11

Modified Files:
	import.log ngspice.spec 
Added Files:
	ngspice-rework-20-compatmode.h 
Log Message:
fixed built with compatmode.h


--- NEW FILE ngspice-rework-20-compatmode.h ---
#ifndef _COMPATMODE_H
#define _COMPATMODE_H

#include <config.h>

typedef enum {
  COMPATMODE_NATIVE = 0,
  COMPATMODE_HSPICE = 1,
  COMPATMODE_SPICE3 = 2  
} COMPATMODE_T ;

#endif


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Dec 2009 00:22:39 -0000	1.5
+++ import.log	8 Dec 2009 23:13:03 -0000	1.6
@@ -3,3 +3,4 @@ ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10
 ngspice-19-1_fc11:F-11:ngspice-19-1.fc11.src.rpm:1249833216
 ngspice-20-1_fc12:F-11:ngspice-20-1.fc12.src.rpm:1259910146
 ngspice-20-2_fc12:F-11:ngspice-20-2.fc12.src.rpm:1260231652
+ngspice-20-3_fc12:F-11:ngspice-20-3.fc12.src.rpm:1260313898


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/ngspice.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ngspice.spec	8 Dec 2009 00:22:40 -0000	1.20
+++ ngspice.spec	8 Dec 2009 23:13:03 -0000	1.21
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -8,6 +8,7 @@ Group:             Applications/Engineer
 URL:               http://%{name}.sourceforge.net/
 
 Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source1:           ngspice-rework-20-compatmode.h
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ensuring interoperability with xcircuit via Tcl
@@ -70,6 +71,8 @@ code base with many improvements.
 
 %patch0 -p0 -b .xcircuit
 
+cp -p %{SOURCE1} src/include/compatmode.h
+
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
                examples/tclspice/tcl-testbench1/testCapa.cir \
@@ -99,10 +102,10 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%{__libtoolize} --force --copy
-%{__aclocal}
-%{__automake} --add-missing
-%{__autoconf}
+#{__libtoolize} --force --copy
+#{__aclocal}
+#{__automake} --add-missing
+#{__autoconf}
 
 %build
 
@@ -132,7 +135,11 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-dot-global \
     --enable-shared \
     --enable-ndev \
+%if 0%{?fedora}
     --with-tcl=%{_libdir}/tcl8.5/ \
+%else
+    --with-tcl=%{_libdir}/ \
+%endif
     --libdir=%{_libdir}/tclspice
 
 %{__make}
@@ -223,6 +230,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-3
+- Fixed build on CentOS-5
+
 * Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
 - Improved interoperobability with xcircuit