rpms/gnucap/devel .cvsignore, 1.2, 1.3 gnucap-0.34-debian.patch, 1.1, 1.2 gnucap.spec, 1.2, 1.3 sources, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Feb 14 13:29:32 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/gnucap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19854
Modified Files:
.cvsignore gnucap-0.34-debian.patch gnucap.spec sources
Log Message:
* Wed Feb 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.35-1
- New upstream release 0.35
- Link with -lncurses instead of -ltermcap (bz 226771)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 27 Apr 2006 19:29:32 -0000 1.2
+++ .cvsignore 14 Feb 2007 13:28:59 -0000 1.3
@@ -1 +1 @@
-gnucap-0.34.tar.gz
+gnucap-0.35.tar.gz
gnucap-0.34-debian.patch:
Index: gnucap-0.34-debian.patch
===================================================================
RCS file: /cvs/extras/rpms/gnucap/devel/gnucap-0.34-debian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnucap-0.34-debian.patch 27 Apr 2006 19:29:32 -0000 1.1
+++ gnucap-0.34-debian.patch 14 Feb 2007 13:28:59 -0000 1.2
@@ -1,5 +1,5 @@
---- gnucap-0.34.orig/doc/whatisit
-+++ gnucap-0.34/doc/whatisit
+--- gnucap-0.35/doc/whatisit.debian 2000-08-16 10:15:00.000000000 +0200
++++ gnucap-0.35/doc/whatisit 2007-02-14 13:04:05.000000000 +0100
@@ -1,4 +1,4 @@
-ACS is a general purpose circuit simulator. It performs nonlinear
+Gnucap is a general purpose circuit simulator. It performs nonlinear
@@ -58,9 +58,9 @@
Albert Davis
aldavis at ieee.org
---- gnucap-0.34.orig/src/bm.cc
-+++ gnucap-0.34/src/bm.cc
-@@ -207,7 +207,8 @@
+--- gnucap-0.35/src/bm.cc.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/bm.cc 2007-02-14 13:04:05.000000000 +0100
+@@ -141,7 +141,8 @@
/*--------------------------------------------------------------------------*/
void EVAL_BM_ACTION_BASE::tr_finish_tdv(ELEMENT* d, double val)const
{
@@ -70,19 +70,19 @@
tr_final_adjust(&(d->_y0), false);
}
/*--------------------------------------------------------------------------*/
---- gnucap-0.34.orig/src/e_card.h
-+++ gnucap-0.34/src/e_card.h
-@@ -32,6 +32,7 @@
- // external
+--- gnucap-0.35/src/e_card.h.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/e_card.h 2007-02-14 13:04:05.000000000 +0100
+@@ -35,6 +35,7 @@
+ class CARD_LIST;
class CS;
class COMMON_COMPONENT;
+CARD_LIST::fat_iterator findbranch(CS&,CARD_LIST::fat_iterator);
/*--------------------------------------------------------------------------*/
class CARD : public CKT_BASE {
private:
---- gnucap-0.34.orig/src/d_vcvs.cc
-+++ gnucap-0.34/src/d_vcvs.cc
-@@ -58,7 +58,8 @@
+--- gnucap-0.35/src/d_vcvs.cc.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/d_vcvs.cc 2007-02-14 13:04:05.000000000 +0100
+@@ -61,7 +61,8 @@
assert(_y0.f0 != LINEAR);
store_values();
q_load();
@@ -92,33 +92,33 @@
_m0 *= -_loss0;
}else{
assert(conchk(_loss0, 1./OPT::shortckt));
---- gnucap-0.34.orig/src/u_sdp.h
-+++ gnucap-0.34/src/u_sdp.h
-@@ -29,6 +29,9 @@
- #include "ap.h"
+--- gnucap-0.35/src/u_sdp.h.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/u_sdp.h 2007-02-14 13:04:05.000000000 +0100
+@@ -32,6 +32,9 @@
/*--------------------------------------------------------------------------*/
class OMSTREAM;
+ class CARD_LIST;
+class SDP;
+bool get(CS& cmd, const std::string& key, SDP* value,
+ AP_MOD mod, double scale);
/*--------------------------------------------------------------------------*/
class SDP {
- friend bool get(CS& cmd, const std::string& key, SDP* value,
---- gnucap-0.34.orig/src/e_storag.cc
-+++ gnucap-0.34/src/e_storag.cc
+ friend bool get(CS& cmd, const std::string& key, SDP* value);
+--- gnucap-0.35/src/e_storag.cc.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/e_storag.cc 2007-02-14 13:04:05.000000000 +0100
@@ -78,7 +78,8 @@
_dt = NOT_VALID;
- _i0 = _q[0] = _q[1] = _q[2] = _q[3] = FPOLY1(0., 0., 0.);
+ _i0 = _q[0] = _q[1] = _q[2] = FPOLY1(0., 0., 0.);
_it1_f0 = 0.;
- _m1 = _m0 = CPOLY1(0., 0., 0.);
+ CPOLY1 cp1(0., 0., 0.);
+ _m1 = _m0 = cp1;
assert(_loss0 == 0.);
assert(_loss1 == 0.);
- if (!using_tr_eval()){
---- gnucap-0.34.orig/src/d_admit.cc
-+++ gnucap-0.34/src/d_admit.cc
-@@ -56,7 +56,8 @@
+ if (!using_tr_eval()) {
+--- gnucap-0.35/src/d_admit.cc.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/d_admit.cc 2007-02-14 13:04:05.000000000 +0100
+@@ -57,7 +57,8 @@
assert(_y0.f0 != LINEAR);
store_values();
q_load();
@@ -128,7 +128,7 @@
}else{
assert(_y0.f0 == LINEAR);
assert(_y0.f1 == value());
-@@ -171,7 +172,8 @@
+@@ -172,7 +173,8 @@
bool DEV_CPOLY_G::do_tr()
{
assert(_values);
@@ -138,9 +138,9 @@
return do_tr_con_chk_and_q();
}
/*--------------------------------------------------------------------------*/
-@@ -193,7 +195,8 @@
- }}
- }}
+@@ -195,7 +197,8 @@
+ }
+ }
trace2("", _values[0], c0);
- _m0 = CPOLY1(0., c0, _values[1]);
+ CPOLY1 cp1(0., c0, _values[1]);
@@ -148,8 +148,8 @@
return do_tr_con_chk_and_q();
}
---- gnucap-0.34.orig/src/e_compon.h
-+++ gnucap-0.34/src/e_compon.h
+--- gnucap-0.35/src/e_compon.h.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/e_compon.h 2007-02-14 13:04:05.000000000 +0100
@@ -43,6 +43,9 @@
}
/*--------------------------------------------------------------------------*/
@@ -160,21 +160,21 @@
// pass this as an argument to a common constructor to mark it as static,
// so it won't be deleted
/*--------------------------------------------------------------------------*/
---- gnucap-0.34.orig/src/d_cap.cc
-+++ gnucap-0.34/src/d_cap.cc
-@@ -49,7 +49,8 @@
+--- gnucap-0.35/src/d_cap.cc.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/d_cap.cc 2007-02-14 13:05:47.000000000 +0100
+@@ -47,7 +47,8 @@
+ _i0.x = _y0.x;
_i0.f0 = differentiate();
_i0.f1 = tr_c_to_g(_q[0].f1, _i0.f1);
-
- _m0 = CPOLY1(_i0);
+ CPOLY1 cp1(_i0);
+ _m0 = cp1;
return converged();
}
/*--------------------------------------------------------------------------*/
-@@ -172,7 +173,8 @@
- }}
- }}
+@@ -191,7 +192,8 @@
+ assert(_vi0[i] == _vi0[i]);
+ }
- _m0 = CPOLY1(0., _vi0[0], _vi0[1]);
+ CPOLY1 cp1(0., _vi0[0], _vi0[1]);
@@ -182,9 +182,9 @@
return do_tr_con_chk_and_q();
}
/*--------------------------------------------------------------------------*/
---- gnucap-0.34.orig/src/l_timer.h
-+++ gnucap-0.34/src/l_timer.h
-@@ -25,6 +25,8 @@
+--- gnucap-0.35/src/l_timer.h.debian 2006-08-28 08:15:43.000000000 +0200
++++ gnucap-0.35/src/l_timer.h 2007-02-14 13:04:05.000000000 +0100
+@@ -26,6 +26,8 @@
#define U_TIMER_H
#include "io_.h"
/*--------------------------------------------------------------------------*/
@@ -193,102 +193,9 @@
class TIMER {
private:
enum {_T_NAME_LEN = 8};
---- gnucap-0.34.orig/ibis/model-in.cc
-+++ gnucap-0.34/ibis/model-in.cc
-@@ -145,23 +145,23 @@
- /*--------------------------------------------------------------------------*/
- void Model_Base::Type::parse(CS& file)
- {
-- set(file, "Terminator", &_type, mtTERMINATOR)
-- || set(file, "Input_ECL", &_type, mtINPUT_ECL)
-- || set(file, "Input", &_type, mtINPUT)
-- || set(file, "I/O_open_sink", &_type, mtIO_OPEN_SINK)
-- || set(file, "I/O_open_drain", &_type, mtIO_OPEN_DRAIN)
-- || set(file, "I/O_open_source",&_type, mtIO_OPEN_SOURCE)
-- || set(file, "I/O_ECL", &_type, mtIO_ECL)
-- || set(file, "I/O", &_type, mtIO)
-- || set(file, "3-state_ECL", &_type, mt3STATE_ECL)
-- || set(file, "3-state", &_type, mt3STATE)
-- || set(file, "Output_ECL", &_type, mtOUTPUT_ECL)
-- || set(file, "Output", &_type, mtOUTPUT)
-- || set(file, "Open_sink", &_type, mtOPEN_SINK)
-- || set(file, "Open_drain", &_type, mtOPEN_DRAIN)
-- || set(file, "Open_source", &_type, mtOPEN_SOURCE)
-- || set(file, "Series_switch", &_type, mtSERIES_SWITCH)
-- || set(file, "Series", &_type, mtSERIES)
-+ set(file, "Terminator", (int*)&_type, (int)mtTERMINATOR)
-+ || set(file, "Input_ECL", (int*)&_type, (int)mtINPUT_ECL)
-+ || set(file, "Input", (int*)&_type, (int)mtINPUT)
-+ || set(file, "I/O_open_sink", (int*)&_type, (int)mtIO_OPEN_SINK)
-+ || set(file, "I/O_open_drain", (int*)&_type, (int)mtIO_OPEN_DRAIN)
-+ || set(file, "I/O_open_source",(int*)&_type, (int)mtIO_OPEN_SOURCE)
-+ || set(file, "I/O_ECL", (int*)&_type, (int)mtIO_ECL)
-+ || set(file, "I/O", (int*)&_type, (int)mtIO)
-+ || set(file, "3-state_ECL", (int*)&_type, (int)mt3STATE_ECL)
-+ || set(file, "3-state", (int*)&_type, (int)mt3STATE)
-+ || set(file, "Output_ECL", (int*)&_type, (int)mtOUTPUT_ECL)
-+ || set(file, "Output", (int*)&_type, (int)mtOUTPUT)
-+ || set(file, "Open_sink", (int*)&_type, (int)mtOPEN_SINK)
-+ || set(file, "Open_drain", (int*)&_type, (int)mtOPEN_DRAIN)
-+ || set(file, "Open_source", (int*)&_type, (int)mtOPEN_SOURCE)
-+ || set(file, "Series_switch", (int*)&_type, (int)mtSERIES_SWITCH)
-+ || set(file, "Series", (int*)&_type, (int)mtSERIES)
- || file.warn(0, "illegal model type");
- }
- /*--------------------------------------------------------------------------*/
-@@ -235,8 +235,8 @@
- /*--------------------------------------------------------------------------*/
- void IO_Base::Polarity::parse(CS& file)
- {
-- set(file, "Non-Inverting", &_p, pNON_INVERTING)
-- || set(file, "Inverting", &_p, pINVERTING)
-+ set(file, "Non-Inverting", (int*)&_p, (int)pNON_INVERTING)
-+ || set(file, "Inverting", (int*)&_p, (int)pINVERTING)
- || file.warn(0, "need Inverting or Non-Inverting");
- }
- /*--------------------------------------------------------------------------*/
---- gnucap-0.34.orig/ibis/base.h
-+++ gnucap-0.34/ibis/base.h
-@@ -40,7 +40,7 @@
- class Base
- {
- private:
-- explicit Base(const Base&) {unreachable();}
-+// explicit Base(const Base&) {unreachable();}
- // This private base copy constructor inhibits generation of
- // copy constructors for its derived classes.
- protected:
---- gnucap-0.34.orig/ibis/comp-in.cc
-+++ gnucap-0.34/ibis/comp-in.cc
-@@ -24,8 +24,8 @@
- /*--------------------------------------------------------------------------*/
- void Component::Pin_Die::parse(CS& file)
- {
-- set(file, "Pin", &_pd, pdPIN)
-- || set(file, "Die", &_pd, pdDIE)
-+ set(file, "Pin", (int*)&_pd, (int)pdPIN)
-+ || set(file, "Die", (int*)&_pd, (int)pdDIE)
- || file.warn(0, "need Pin or Die");
- }
- /*--------------------------------------------------------------------------*/
---- gnucap-0.34.orig/ibis/file-in.cc
-+++ gnucap-0.34/ibis/file-in.cc
-@@ -25,9 +25,9 @@
- /*--------------------------------------------------------------------------*/
- void Redistribution::parse(CS& file)
- {
-- set(file, "Yes", &_r, dYES)
-- || set(file, "No", &_r, dNO)
-- || set(file, "Specific",&_r, dSPECIFIC)
-+ set(file, "Yes", (int*)&_r, (int)dYES)
-+ || set(file, "No", (int*)&_r, (int)dNO)
-+ || set(file, "Specific",(int*)&_r, (int)dSPECIFIC)
- || file.warn(0, "need Yes, No, or Specific");
- }
- /*--------------------------------------------------------------------------*/
---- gnucap-0.34.orig/modelgen/mg_.h
-+++ gnucap-0.34/modelgen/mg_.h
-@@ -118,7 +118,7 @@
+--- gnucap-0.35/modelgen/mg_.h.debian 2006-08-28 07:45:36.000000000 +0200
++++ gnucap-0.35/modelgen/mg_.h 2007-02-14 13:04:05.000000000 +0100
+@@ -120,7 +120,7 @@
}
T* p = new T(file);
{if (!file.stuck(&here)) {
@@ -297,7 +204,7 @@
}else {
delete p;
file.warn(0, "not valid here");
-@@ -137,7 +137,7 @@
+@@ -141,7 +141,7 @@
int here = file.cursor();
T* m = new T(file);
{if (!file.stuck(&here)) {
@@ -306,8 +213,8 @@
}else{
delete m;
file.warn(0, "what's this??");
---- gnucap-0.34.orig/examples/runall
-+++ gnucap-0.34/examples/runall
+--- gnucap-0.35/examples/runall.debian 2000-09-05 06:22:00.000000000 +0200
++++ gnucap-0.35/examples/runall 2007-02-14 13:04:05.000000000 +0100
@@ -1,16 +1,16 @@
-#
-$1 -b eq2-145.ckt
Index: gnucap.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucap/devel/gnucap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnucap.spec 28 Aug 2006 11:31:29 -0000 1.2
+++ gnucap.spec 14 Feb 2007 13:28:59 -0000 1.3
@@ -1,6 +1,6 @@
Name: gnucap
-Version: 0.34
-Release: 3%{?dist}
+Version: 0.35
+Release: 1%{?dist}
Summary: The Gnu Circuit Analysis Package
Group: Applications/Engineering
License: GPL
@@ -22,29 +22,25 @@
%prep
%setup -q
-%patch0 -p1 -z .debian
-%{__sed} -i 's!/usr/lib!%{_libdir}!g' src/configure
-%{__sed} -i 's!ln -s!ln!g' src/Make1
-%{__sed} -i 's!ln -s!ln!g' src/Make.aux
-mv doc/acs-tutorial doc/gnucap-tutorial
+%patch0 -p1
+# use ncurses instead of termcap (bz 226771)
+sed -i 's/-ltermcap/-lncurses/g' configure
%build
-# Don't use %%configure because this is not an autotools-generated
-# configure script and will choke on some of the default configure switches.
-./configure --prefix=%{_prefix}
-make %{?_smp_mflags} \
- CCFLAGS="$RPM_OPT_FLAGS -DHAS_READLINE -DUNIX -DNDEBUG -I. -I.."
+%configure
+make %{?_smp_mflags}
%install
# make install uses hardcoded /usr/bin etc paths, so we must do this DIY
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 755 src/O/gnucap $RPM_BUILD_ROOT%{_bindir}
-install -m 755 ibis/O/gnucap-ibis $RPM_BUILD_ROOT%{_bindir}
-install -m 755 modelgen/O/gnucap-modelgen $RPM_BUILD_ROOT%{_bindir}
-install -m 644 doc/gnucap.1 doc/gnucap-ibis.1 $RPM_BUILD_ROOT%{_mandir}/man1
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# for %%doc
+rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}
+mv doc/acs-tutorial doc/gnucap-tutorial
+rm examples/Makefile*
%clean
@@ -54,12 +50,16 @@
%files
%defattr(-,root,root,-)
%doc doc/COPYING doc/history doc/relnotes.* doc/gnucap-tutorial doc/whatisit
-%doc man/gnucap-man.pdf man/html
+%doc man/gnucap-man.pdf examples
%{_bindir}/%{name}*
-%{_mandir}/man1/%{name}*.1.gz
+%{_mandir}/man1/%{name}.1.gz
%changelog
+* Wed Feb 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.35-1
+- New upstream release 0.35
+- Link with -lncurses instead of -ltermcap (bz 226771)
+
* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.34-3
- FE6 Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Apr 2006 19:29:32 -0000 1.2
+++ sources 14 Feb 2007 13:28:59 -0000 1.3
@@ -1 +1 @@
-0d346f02a38c544fda6f8d7ec4f8b45e gnucap-0.34.tar.gz
+16fc7cacac987ea556753d030f2595b9 gnucap-0.35.tar.gz
More information about the scm-commits
mailing list