rpms/ngspice/EL-6 .cvsignore, 1.7, 1.8 import.log, 1.9, 1.10 ngspice.spec, 1.25, 1.26 sources, 1.7, 1.8 ngspice-rework-20-compatmode.h, 1.3, NONE ngspice-xcircuit_bridge.patch, 1.5, NONE

Thu Jul 22 17:42:17 UTC 2010

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3301/EL-6

Modified Files:
	.cvsignore import.log ngspice.spec sources 
Removed Files:
	ngspice-rework-20-compatmode.h ngspice-xcircuit_bridge.patch 
Log Message:
doubling of time steps with XSPICE fixed


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8

--- .cvsignore	16 Jul 2010 21:16:29 -0000	1.7
+++ .cvsignore	22 Jul 2010 17:42:16 -0000	1.8
@@ -1 +1,2 @@
-ng-spice-rework-20.tar.gz
+ngspice-21.pdf
+ngspice-rework-20.cvs20100719.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-6/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	16 Jul 2010 21:16:29 -0000	1.9
+++ import.log	22 Jul 2010 17:42:17 -0000	1.10
@@ -7,3 +7,4 @@ ngspice-20-3_fc12:F-12:ngspice-20-3.fc12
 ngspice-21-1_cvs20100620_fc12:EL-6:ngspice-21-1.cvs20100620.fc12.src.rpm:1278012375
 ngspice-21-2_cvs20100620_fc12:EL-6:ngspice-21-2.cvs20100620.fc12.src.rpm:1278955578
 ngspice-20-3_fc12:EL-6:ngspice-20-3.fc12.src.rpm:1279314908
+ngspice-21-3_cvs20100719_el6:EL-6:ngspice-21-3.cvs20100719.el6.src.rpm:1279820469


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-6/ngspice.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ngspice.spec	16 Jul 2010 21:16:29 -0000	1.25
+++ ngspice.spec	22 Jul 2010 17:42:17 -0000	1.26
@@ -1,25 +1,36 @@
+#
+## To download development trunk
+#
+# cvs -d:pserver:anonymous at ngspice.cvs.sourceforge.net:/cvsroot/ngspice login
+# cvs -z3 -d:pserver:anonymous at ngspice.cvs.sourceforge.net:/cvsroot/ngspice co -P ngspice
+# tar cjf ~/rpmbuild/SOURCES/ngspice-rework-20.cvs`date '+%Y%m%d'`.tar.bz2 ngspice
+
 Name:              ngspice
-Version:           20
-Release:           3%{?dist}
+Version:           21
+Release:           3.cvs20100719%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
 Group:             Applications/Engineering
-URL:               http://%{name}.sourceforge.net/
+URL:               http://ngspice.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)
+#Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ngspice%{version}_100620.zip
+Source0:           ngspice-rework-20.cvs20100719.tar.bz2
+Source1:           ngspice-21.pdf
 
-# Ensuring interoperability with xcircuit via Tcl
-Patch0:            %{name}-xcircuit_bridge.patch
+BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):    /sbin/install-info
-Requires(preun):   /sbin/install-info
+# Ensured interoperability with xcircuit via Tcl
 
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel, automake, libtool
+BuildRequires:     lyx
+BuildRequires:     bison
+BuildRequires:     byacc
+BuildRequires:     flex ImageMagick
 
+Obsoletes:         ngspice-doc < 20-4.cvs20100619
+Provides:          ngspice-doc = %{version}-%{release}
 
 %description
 Ngspice is a general-purpose circuit simulator program.
@@ -43,18 +54,6 @@ develop their own models for devices usi
 It could be used for VLSI simulations as well.
 
 
-%package doc
-Summary:           Documentation for ngspice, a mixed level/signal circuit simulator
-Group:             Documentation
-Requires:          ngspice = %{version}-%{release}
-Requires(post):    /sbin/install-info
-Requires(preun):   /sbin/install-info
-
-%description doc
-This package contains the documentation of ngspice in pdf, postscript
-and info format.
-
-
 %package -n        tclspice
 Summary:           Tcl/Tk interface for ngspice
 Group:             Applications/Engineering
@@ -67,11 +66,8 @@ the  Tcl/Tk scripting language. The proj
 code base with many improvements.
 
 %prep
-%setup -q
-
-%patch0 -p0 -b .xcircuit
-
-cp -p %{SOURCE1} src/include/compatmode.h
+%setup -q -n ngspice
+cd ng-spice-rework
 
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
@@ -86,6 +82,8 @@ find examples/ -type f -name ".cvsignore
 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
@@ -106,9 +104,17 @@ examples/tclspice/tcl-testbench4/tcl-tes
 #{__aclocal}
 #{__automake} --add-missing
 #{__autoconf}
+./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
@@ -121,10 +127,14 @@ export CFLAGS="%{optflags} -I%{_included
 # Configure tclspice
 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
+
 %configure \
     --disable-xgraph \
     --enable-xspice \
     --enable-maintainer-mode \
+    --enable-dependency-tracking \
     --enable-capzerobypass \
     --enable-cider \
     --enable-newpred \
@@ -137,7 +147,7 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --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 \
@@ -162,13 +173,16 @@ cd ..
     --enable-ndev \
     --libdir=%{_libdir}
 
-%{__make} %{?_smp_mflags}
+%{__make}
+# %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
+cd ng-spice-rework
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
+
 # ---- Tclspice ----------------------------------------------------------------
 # Tclspice : Make install
 cd tclspice
@@ -183,7 +197,8 @@ cd ..
 rm -rf   %{buildroot}%{_docdir}/%{name}-%{version}/
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
 cp -pr examples/ %{buildroot}%{_docdir}/%{name}-%{version}/
-cp -pr doc/*.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}/
 
@@ -195,26 +210,21 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
 %check
+cd ng-spice-rework/tests
 #make check
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%post doc
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-
-%preun doc
-/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-
-
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_libdir}/spice/
 %{_mandir}/man1/*
-
+%exclude %doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%doc %{_docdir}/%{name}-%{version}/
 
 %files -n tclspice
 %defattr(-,root,root,-)
@@ -222,14 +232,16 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 %{_libdir}/tclspice/
 
 
-%files doc
-%defattr(-, root, root, -)
-%exclude %doc %{_docdir}/%{name}-%{version}/examples/tclspice
-%doc %{_docdir}/%{name}-%{version}/
-%{_infodir}/ngspice.info*.*
+%changelog
+* Sun Jul 11 2010  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 21-2.cvs20100620
+- added bison and byacc as BR
 
+* Thu Jul 01 2010  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 21-1.cvs20100620
+- release -21 with BSIMSOI support for < 130nm designs
+
+* Sat Jun 19 2010  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-4.cvs20100619
+- prerelease -21 with BSIMSOI support for < 130nm designs
 
-%changelog
 * Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-3
 - Fixed build on CentOS-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Jul 2010 21:16:29 -0000	1.7
+++ sources	22 Jul 2010 17:42:17 -0000	1.8
@@ -1 +1,2 @@
-81bc667a4190ef31081a6957d3c7f7b5  ng-spice-rework-20.tar.gz
+95ee9f647e5c50fdcb2a9a26a519295b  ngspice-21.pdf
+669587010b890413bf26e35cccd400d4  ngspice-rework-20.cvs20100719.tar.bz2


--- ngspice-rework-20-compatmode.h DELETED ---


--- ngspice-xcircuit_bridge.patch DELETED ---

