rpms/ngspice/F-13 .cvsignore, 1.5, 1.6 import.log, 1.6, 1.7 ngspice.spec, 1.22, 1.23 sources, 1.5, 1.6 ngspice-rework-20-compatmode.h, 1.1, NONE ngspice-xcircuit_bridge.patch, 1.3, NONE
Chitlesh GOORAH
chitlesh at fedoraproject.org
Thu Jul 1 19:23:21 UTC 2010
Author: chitlesh
Update of /cvs/pkgs/rpms/ngspice/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13368/F-13
Modified Files:
.cvsignore import.log ngspice.spec sources
Removed Files:
ngspice-rework-20-compatmode.h ngspice-xcircuit_bridge.patch
Log Message:
rework 21
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 4 Dec 2009 07:07:39 -0000 1.5
+++ .cvsignore 1 Jul 2010 19:23:20 -0000 1.6
@@ -1 +1 @@
-ng-spice-rework-20.tar.gz
+ngspice-rework-20.cvs20100619.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-13/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log 8 Dec 2009 23:17:38 -0000 1.6
+++ import.log 1 Jul 2010 19:23:20 -0000 1.7
@@ -4,3 +4,4 @@ ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11
ngspice-20-1_fc12:HEAD:ngspice-20-1.fc12.src.rpm:1259910372
ngspice-20-2_fc12:HEAD:ngspice-20-2.fc12.src.rpm:1260231894
ngspice-20-3_fc12:HEAD:ngspice-20-3.fc12.src.rpm:1260314184
+ngspice-21-1_cvs20100620_fc12:F-13:ngspice-21-1.cvs20100620.fc12.src.rpm:1278012133
Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-13/ngspice.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ngspice.spec 8 Dec 2009 23:17:38 -0000 1.22
+++ ngspice.spec 1 Jul 2010 19:23:21 -0000 1.23
@@ -1,25 +1,32 @@
+#
+## 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: 1.cvs20100620%{?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.cvs20100619.tar.bz2
-# 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
+Obsoletes: ngspice-doc < 20-4.cvs20100619
+Provides: ngspice-doc = %{version}-%{release}
%description
Ngspice is a general-purpose circuit simulator program.
@@ -43,18 +50,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 +62,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 \
@@ -106,9 +98,11 @@ examples/tclspice/tcl-testbench4/tcl-tes
#{__aclocal}
#{__automake} --add-missing
#{__autoconf}
+./autogen.sh
%build
+cd ng-spice-rework
# ---- Tclspice ----------------------------------------------------------------
# Adding BLT support
@@ -121,6 +115,9 @@ 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 \
@@ -162,10 +159,12 @@ 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}
@@ -183,7 +182,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 -pr manual/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
+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 +195,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 +217,13 @@ 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
+* Thu Jul 01 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 21-0.cvs20100620
+- prerelease -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/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 4 Dec 2009 07:07:39 -0000 1.5
+++ sources 1 Jul 2010 19:23:21 -0000 1.6
@@ -1 +1 @@
-81bc667a4190ef31081a6957d3c7f7b5 ng-spice-rework-20.tar.gz
+ad714f1aa268edac34681c2008071fcd ngspice-rework-20.cvs20100619.tar.bz2
--- ngspice-rework-20-compatmode.h DELETED ---
--- ngspice-xcircuit_bridge.patch DELETED ---
More information about the scm-commits
mailing list