stable release includes couple of bugfixes 23

.gitignore

@@ -1,3 +1,5 @@
 ngspice-21.pdf
 ngspice-rework-20.cvs20100719.tar.bz2
 /ngspice-rework-22.cvs20101113.tar.bz2
+/ngspice-23.tar.gz
+/ngspice23-manual.pdf

ngspice.spec

@@ -1,30 +1,46 @@
+# Features in Fedora/Free Electronic Lab
+#  What else does this build do aside compiling ngspice ?
+#    -  Ensures interoperability with xcircuit via Tcl
+#    -  Ensures interoperability with mot-adms
+#    -  Provides tclspice capabilities
+# Chitlesh Goorah
+
 #
 ## To download development trunk
 #
 # cvs -d:pserver:anonymous@ngspice.cvs.sourceforge.net:/cvsroot/ngspice login
 # cvs -z3 -d:pserver:anonymous@ngspice.cvs.sourceforge.net:/cvsroot/ngspice export -DNOW ngspice
-# tar cjf ~/rpmbuild/SOURCES/ngspice-rework-22.cvs`date '+%Y%m%d'`.tar.bz2 ngspice
+# tar cjf ~/rpmbuild/SOURCES/ngspice-rework-23.`date '+%Y%m%d'`cvs.tar.bz2 ngspice
+
+# Toggle the following declaration when using version controlled snapshots
+%define devel 0
 
 Name:              ngspice
-Version:           22
+Version:           23
-Release:           6.cvs20101113%{?dist}
+%if %{?devel}
+%define snap      .20111129cvs       
+%endif
+Release:           1%{?snap}%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
 Group:             Applications/Engineering
 URL:               http://ngspice.sourceforge.net
 
-#Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ngspice%{version}_100620.zip
+%if %{?devel}
-Source0:           ngspice-rework-22.cvs20101113.tar.bz2
+Source0:           ngspice-rework-%{version}%{snap}.tar.bz2
+%else
+Source0:           https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-%{version}.tar.gz
+Source1:           https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice%{version}-manual.pdf
+%endif
 
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Ensured interoperability with xcircuit via Tcl
-# Ensured interoperability with mot-adms
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel, automake, libtool
+%if %{?devel}
 BuildRequires:     lyx
+%endif
 BuildRequires:     bison
 BuildRequires:     byacc
 BuildRequires:     flex ImageMagick
@@ -52,7 +68,7 @@ then some tweak is necessary merge it with spice3f5). Xspice provides a
 codemodel interface and an event-driven simulation algorithm. Users can
 develop their own models for devices using the codemodel interface.
 
-It could be used for VLSI simulations as well.
+It can be used for VLSI simulations as well.
 
 
 %package -n        tclspice
@@ -67,13 +83,17 @@ the  Tcl/Tk scripting language. The project is based upon the NG-Spice source
 code base with many improvements.
 
 %prep
+%if %{?devel}
 %setup -q -n ngspice
 cd ng-spice-rework
+%else
+%setup -q
+%endif
 
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
                examples/tclspice/tcl-testbench1/testCapa.cir \
-               examples/tclspice/tcl-testbench1/capa.cir ; do
+               examples/tclspice/tcl-testbench1/capa.cir ChangeLog; do
   %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
   %{__mv} -f $nonUTF8.conv $nonUTF8
 done
@@ -82,8 +102,9 @@ done
 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  {} ';'
+find src/ -type f -name "*.l" -exec chmod -x  {} ';'
+find src/ -type f -name "*.y" -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@/@libname@|@XSPICEINIT@ codemodel %{_libdir}|" \
@@ -109,6 +130,7 @@ sed -i "s|AM_CPPFLAGS =|AM_CPPFLAGS = -I\$(top_srcdir)/src/maths/ni |" src/spice
 chmod +x configure
 
 %build
+%if %{?devel}
 # ---- Manual ----------------------------------------------------------------
 cd ng-spice-manuals
 autoreconf  -Wno-portability --install
@@ -116,6 +138,7 @@ autoreconf  -Wno-portability --install
 cd ..
 
 cd ng-spice-rework
+%endif
 
 # ---- Tclspice ----------------------------------------------------------------
 # Adding BLT support
@@ -129,7 +152,9 @@ 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
+%if %{?devel}
+sed -i  's|../ng-spice-manuals|../../ng-spice-manuals|g' manual/Makefile.am
+%endif
 
 %configure \
     --disable-xgraph \
@@ -185,7 +210,9 @@ cd ..
 
 %install
 %{__rm} -rf %{buildroot}
+%if %{?devel}
 cd ng-spice-rework
+%endif
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
@@ -206,7 +233,12 @@ cp -pr ./src/spicelib/devices/adms/ %{buildroot}%{_datadir}/%{name}
 rm -rf   %{buildroot}%{_docdir}/%{name}-%{version}/
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
 cp -pr examples/ %{buildroot}%{_docdir}/%{name}-%{version}/
+%if %{?devel}
 cp -p ../ng-spice-manuals/manual.pdf %{buildroot}%{_docdir}/%{name}-%{version}/%{name}-%{version}.pdf
+%else
+cp -p %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}/%{name}-%{version}.pdf
+%endif
+
 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}/
@@ -219,7 +251,11 @@ chmod +x %{buildroot}%{_libdir}/tclspice/spice/*.cm
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
 %check
+%if %{?devel}
 cd ng-spice-rework/tests
+%else
+cd tests
+%endif
 #make check
 
 
@@ -242,6 +278,10 @@ cd ng-spice-rework/tests
 
 
 %changelog
+* Tue Nov 29 2011  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 23-1
+- New upstream sources with various bug fixes
+- Upstream added #include <ftedev.h> to src/include/tclspice.h
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 22-6.cvs20101113
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

sources

@@ -1 +1,2 @@
-235069574957210ed3578a1676fd4550  ngspice-rework-22.cvs20101113.tar.bz2
+bc7faa7348e307145b3bb04ef70a87d2  ngspice-23.tar.gz
+eb0d68eb463a41a0571757a00a5b9f9d  ngspice23-manual.pdf