compiled with mot-adms support

This commit is contained in:
Chitlesh Goorah 2010-11-15 07:06:03 +01:00
parent b2076e7a4d
commit f0df0e694a
3 changed files with 40 additions and 22 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
ngspice-21.pdf
ngspice-rework-20.cvs20100719.tar.bz2
/ngspice-rework-22.cvs20101113.tar.bz2

View File

@ -2,12 +2,12 @@
## 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 co -P ngspice
# tar cjf ~/rpmbuild/SOURCES/ngspice-rework-20.cvs`date '+%Y%m%d'`.tar.bz2 ngspice
# 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
Name: ngspice
Version: 21
Release: 3.cvs20100719%{?dist}
Version: 22
Release: 5.cvs20101113%{?dist}
Summary: A mixed level/signal circuit simulator
License: BSD
@ -15,12 +15,12 @@ Group: Applications/Engineering
URL: http://ngspice.sourceforge.net
#Source0: http://downloads.sourceforge.net/sourceforge/%{name}/ngspice%{version}_100620.zip
Source0: ngspice-rework-20.cvs20100719.tar.bz2
Source1: ngspice-21.pdf
Source0: ngspice-rework-22.cvs20101113.tar.bz2
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
@ -28,6 +28,7 @@ BuildRequires: lyx
BuildRequires: bison
BuildRequires: byacc
BuildRequires: flex ImageMagick
BuildRequires: mot-adms
Obsoletes: ngspice-doc < 20-4.cvs20100619
Provides: ngspice-doc = %{version}-%{release}
@ -82,10 +83,10 @@ 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
#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}|" \
sed -i "s|@XSPICEINIT@ codemodel @prefix@/@libname@|@XSPICEINIT@ codemodel %{_libdir}|" \
src/spinit.in
%endif
@ -100,21 +101,21 @@ 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}
./autogen.sh
# Fixed minor CVS build
sed -i "s|AM_CPPFLAGS =|AM_CPPFLAGS = -I\$(top_srcdir)/src/maths/ni |" src/spicelib/analysis/Makefile.am
./autogen.sh --adms
chmod +x configure
%build
# ---- Manual ----------------------------------------------------------------
#cd ng-spice-manuals
#autoreconf -Wno-portability --install
#./configure ; make
#cd ..
cd ng-spice-manuals
autoreconf -Wno-portability --install
./configure ; make
cd ..
cd ng-spice-rework
cp -p %{SOURCE1} .
# ---- Tclspice ----------------------------------------------------------------
# Adding BLT support
@ -132,6 +133,7 @@ sed -i "s|\#define NGSPICEDATADIR \"\`echo \$dprefix/share/ngspice\`\"|\#define
%configure \
--disable-xgraph \
--enable-adms \
--enable-xspice \
--enable-maintainer-mode \
--enable-dependency-tracking \
@ -140,11 +142,13 @@ sed -i "s|\#define NGSPICEDATADIR \"\`echo \$dprefix/share/ngspice\`\"|\#define
--enable-newpred \
--enable-expdevices \
--enable-intnoise \
--enable-openmp \
--enable-predictor \
--enable-numparam \
--enable-dot-global \
--enable-shared \
--enable-ndev \
--with-readline=yes \
%if 0%{?fedora}
--with-tcl=%{_libdir}/tcl8.5/ \
%else
@ -158,6 +162,7 @@ cd ..
%configure \
--disable-xgraph \
--enable-adms \
--enable-xspice \
--enable-maintainer-mode \
--enable-dependency-tracking \
@ -166,11 +171,13 @@ cd ..
--enable-newpred \
--enable-expdevices \
--enable-intnoise \
--enable-openmp \
--enable-predictor \
--enable-numparam \
--enable-dot-global \
--enable-shared \
--enable-ndev \
--with-readline=yes \
--libdir=%{_libdir}
%{__make}
@ -192,15 +199,17 @@ cd ..
%{__rm} -rf %{buildroot}%{_libdir}/tclspice/libspice.la
# ------------------------------------------------------------------------------
# ADMS support
cp -pr ./src/spicelib/devices/adms/ %{buildroot}%{_datadir}/%{name}
# Ensuring that all docs are under %%{_docdir}/%%{name}-%%{version}/
rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
cp -pr examples/ %{buildroot}%{_docdir}/%{name}-%{version}/
cp -p ngspice-21.pdf %{buildroot}%{_docdir}/%{name}-%{version}/%{name}-%{version}.pdf
cp -p ../ng-spice-manuals/manual.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}/
cp -pr AUTHORS COPYING README* BUGS ChangeLog NEWS %{buildroot}%{_docdir}/%{name}-%{version}/
# pull as debuginfo
@ -233,6 +242,15 @@ cd ng-spice-rework/tests
%changelog
* Sat Nov 13 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 21-5.cvs20101113
- new upstream sources with various bug fixes
* Sat Aug 21 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 21-4.cvs20100821
- enabling adms support
* Sun Aug 01 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 21-3.cvs20100719
- new fixes from development trunk
* Sun Jul 11 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 21-2.cvs20100620
- added bison and byacc as BR

View File

@ -1,2 +1 @@
95ee9f647e5c50fdcb2a9a26a519295b ngspice-21.pdf
669587010b890413bf26e35cccd400d4 ngspice-rework-20.cvs20100719.tar.bz2
235069574957210ed3578a1676fd4550 ngspice-rework-22.cvs20101113.tar.bz2