From 887dfad831426d6c17f939bcf2481bc39fd633bf Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Thu, 22 Jul 2010 17:43:52 +0000
Subject: [PATCH] doubling of time steps with XSPICE fixed

---
 .cvsignore   |  3 ++-
 import.log   |  1 +
 ngspice.spec | 22 +++++++++++++++++-----
 sources      |  3 ++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0007b36..af7bc53 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-ngspice-rework-20.cvs20100619.tar.bz2
+ngspice-21.pdf
+ngspice-rework-20.cvs20100719.tar.bz2
diff --git a/import.log b/import.log
index 97143d6..97f34c4 100644
--- a/import.log
+++ b/import.log
@@ -5,3 +5,4 @@ ngspice-20-2_fc12:EL-5:ngspice-20-2.fc12.src.rpm:1260232344
 ngspice-20-3_fc12:EL-5:ngspice-20-3.fc12.src.rpm:1260314383
 ngspice-21-1_cvs20100620_fc12:EL-5:ngspice-21-1.cvs20100620.fc12.src.rpm:1278012263
 ngspice-21-2_cvs20100620_fc12:EL-5:ngspice-21-2.cvs20100620.fc12.src.rpm:1278955346
+ngspice-21-3_cvs20100719_el6:EL-5:ngspice-21-3.cvs20100719.el6.src.rpm:1279820604
diff --git a/ngspice.spec b/ngspice.spec
index dab78cc..5465277 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -7,7 +7,7 @@
 
 Name:              ngspice
 Version:           21
-Release:           2.cvs20100620%{?dist}
+Release:           3.cvs20100719%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -15,7 +15,8 @@ Group:             Applications/Engineering
 URL:               http://ngspice.sourceforge.net
 
 #Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ngspice%{version}_100620.zip
-Source0:           ngspice-rework-20.cvs20100619.tar.bz2
+Source0:           ngspice-rework-20.cvs20100719.tar.bz2
+Source1:           ngspice-21.pdf
 
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -81,6 +82,8 @@ find examples/ -type f -name ".cvsignore" -exec rm -rf {} ';'
 find src/ -type f -name "*.c" -exec chmod -x  {} ';'
 find src/ -type f -name "*.h" -exec chmod -x  {} ';'
 
+sed -i '15,/ /i\#include <ftedev.h>;' src/include/tclspice.h
+
 %ifarch x86_64 sparc64 ppc64 amd64
 sed -i "s|@XSPICEINIT@ codemodel @prefix@/lib|@XSPICEINIT@ codemodel %{_libdir}|" \
 src/spinit.in
@@ -104,8 +107,14 @@ examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 ./autogen.sh
 
 %build
+# ---- Manual ----------------------------------------------------------------
+#cd ng-spice-manuals
+#autoreconf  -Wno-portability --install
+#./configure ; make
+#cd ..
 
 cd ng-spice-rework
+cp -p %{SOURCE1} .
 
 # ---- Tclspice ----------------------------------------------------------------
 # Adding BLT support
@@ -119,12 +128,13 @@ export CFLAGS="%{optflags} -I%{_includedir}/blt"
 cd tclspice
 sed -i "s|\#define NGSPICEDATADIR \"\`echo \$dprefix/share/ngspice\`\"|\#define NGSPICEDATADIR \"\`echo %{_libdir}/tclspice\`\"|" configure*
 # fix ng-spice-manuals directory location
-sed -i  's|../ng-spice-manuals|../../ng-spice-manuals|g' manual/Makefile.am
+#sed -i  's|../ng-spice-manuals|../../ng-spice-manuals|g' manual/Makefile.am
 
 %configure \
     --disable-xgraph \
     --enable-xspice \
     --enable-maintainer-mode \
+    --enable-dependency-tracking \
     --enable-capzerobypass \
     --enable-cider \
     --enable-newpred \
@@ -137,7 +147,7 @@ sed -i  's|../ng-spice-manuals|../../ng-spice-manuals|g' manual/Makefile.am
     --enable-ndev \
 %if 0%{?fedora}
     --with-tcl=%{_libdir}/tcl8.5/ \
-%else
+   %else
     --with-tcl=%{_libdir}/ \
 %endif
     --libdir=%{_libdir}/tclspice
@@ -150,6 +160,7 @@ cd ..
     --disable-xgraph \
     --enable-xspice \
     --enable-maintainer-mode \
+    --enable-dependency-tracking \
     --enable-capzerobypass \
     --enable-cider \
     --enable-newpred \
@@ -171,6 +182,7 @@ cd ng-spice-rework
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
+
 # ---- Tclspice ----------------------------------------------------------------
 # Tclspice : Make install
 cd tclspice
@@ -185,7 +197,7 @@ cd ..
 rm -rf   %{buildroot}%{_docdir}/%{name}-%{version}/
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
 cp -pr examples/ %{buildroot}%{_docdir}/%{name}-%{version}/
-cp -pr manual/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -p ngspice-21.pdf %{buildroot}%{_docdir}/%{name}-%{version}/%{name}-%{version}.pdf
 rm -rf %{buildroot}%{_docdir}/%{name}
 cp -pr Stuarts_Poly_Notes FAQ DEVICES ANALYSES %{buildroot}%{_docdir}/%{name}-%{version}/
 cp -pr AUTHORS COPYING README BUGS ChangeLog NEWS %{buildroot}%{_docdir}/%{name}-%{version}/
diff --git a/sources b/sources
index c51dd13..8fdf294 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-ad714f1aa268edac34681c2008071fcd  ngspice-rework-20.cvs20100619.tar.bz2
+95ee9f647e5c50fdcb2a9a26a519295b  ngspice-21.pdf
+669587010b890413bf26e35cccd400d4  ngspice-rework-20.cvs20100719.tar.bz2