From 6f7ad012342c10c5a7ab1f2f291b02927cf061b5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:55 +0100 Subject: [PATCH 001/132] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- ngspice.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 240ba39..d99e35b 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -26,7 +26,6 @@ Release: 2%{?snap}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD -Group: Applications/Engineering URL: http://ngspice.sourceforge.net %if %{?devel} @@ -91,7 +90,6 @@ It can be used for VLSI simulations as well. %package -n tclspice Summary: Tcl/Tk interface for ngspice -Group: Applications/Engineering BuildRequires: tk-devel BuildRequires: blt-devel From 0ba84406bb045504743d1e0221b3c46329640124 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Feb 2019 12:51:36 +0900 Subject: [PATCH 002/132] F-30: mass rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index d99e35b..6b1f18f 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -22,7 +22,7 @@ Version: 30 %if %{?devel} %global snap .20111129cvs %endif -Release: 2%{?snap}%{?dist} +Release: 3%{?snap}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -368,6 +368,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Tue Feb 05 2019 Mamoru TASAKA - 30-3 +- F-30: mass rebuild + * Sun Jan 20 2019 Mamoru TASAKA - 30-2 - Remove some obsolete or dangerous configure options by the request from the upstream (and ref: bug 1666505) From f0f1bf2ed3489a6e08d1972944f9282daf0795b1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:52 +0100 Subject: [PATCH 003/132] Rebuild for readline 8.0 --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 6b1f18f..7594137 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -22,7 +22,7 @@ Version: 30 %if %{?devel} %global snap .20111129cvs %endif -Release: 3%{?snap}%{?dist} +Release: 4%{?snap}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -368,6 +368,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Sun Feb 17 2019 Igor Gnatenko - 30-4 +- Rebuild for readline 8.0 + * Tue Feb 05 2019 Mamoru TASAKA - 30-3 - F-30: mass rebuild From b78d3a818610e591f78d5d18211d95c33d27a540 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 18:40:09 +0000 Subject: [PATCH 004/132] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 7594137..b655f11 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -22,7 +22,7 @@ Version: 30 %if %{?devel} %global snap .20111129cvs %endif -Release: 4%{?snap}%{?dist} +Release: 5%{?snap}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -368,6 +368,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 30-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Igor Gnatenko - 30-4 - Rebuild for readline 8.0 From 87e07ce6cf6f353a793a12e9a62eed5b50198cfc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Sep 2019 14:21:29 +0900 Subject: [PATCH 005/132] Update to 31 --- .gitignore | 2 ++ bz142910.cir | 14 ++++++++++++++ ngspice.spec | 10 ++++++++-- sources | 4 ++-- 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 bz142910.cir diff --git a/.gitignore b/.gitignore index 90cbd2d..d9077ea 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-29-manual.pdf /ngspice-30.tar.gz /ngspice-30-manual.pdf +/ngspice-31.tar.gz +/ngspice-31-manual.pdf diff --git a/bz142910.cir b/bz142910.cir new file mode 100644 index 0000000..9a2b868 --- /dev/null +++ b/bz142910.cir @@ -0,0 +1,14 @@ +* Pulse source +V1 Vsource 0 pulse 0 1 1n 100ps 100ps 1ns 14ns +* Source impedance +Rsource Vin Vsource 8 +* 50 Ohm transmission line +T1 Vin 0 Vout 0 Z0=50 TD=20ps +* Load impedance +Rout Vout 0 40k + + +.control + tran 0.1ps 2.5n + plot Vin Vout +.endc diff --git a/ngspice.spec b/ngspice.spec index b655f11..8a5ddc6 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -18,11 +18,11 @@ %undefine _changelog_trimtime Name: ngspice -Version: 30 +Version: 31 %if %{?devel} %global snap .20111129cvs %endif -Release: 5%{?snap}%{?dist} +Release: 1%{?snap}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -39,6 +39,8 @@ Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{ve # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-26-blt-linkage-workaround.patch +# Needs upstream report +Patch100: 0001-tclspice-avoid-get_plot-function-type-conflict.patch BuildRequires: gcc @@ -121,6 +123,7 @@ cd ng-spice-rework %setup -q -a 2 %endif %patch0 -p2 -b .link +%patch100 -p1 -b .name # make sure the examples are UTF-8... for nonUTF8 in \ @@ -368,6 +371,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Wed Sep 25 2019 Mamoru TASAKA - 31-1 +- Update to 31 + * Thu Jul 25 2019 Fedora Release Engineering - 30-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 285ef44..2740ed9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-30.tar.gz) = baa67527a05586b6da19e96203889fe013eb19a9e60b159ab9e3828dd5bb865f44bd683e622b256c3c434d77fe7adb5fe1badab75bdeaa9f24faafe7aaaae2e2 -SHA512 (ngspice-30-manual.pdf) = 920953cc36d6f3d2e7751d9ed10e147d4c0a9955ddcca52941d6a30ccb56fec8c15481274726bc718a9617992b5eddee253205e4af9b798b80f54f6e6c45c9d5 +SHA512 (ngspice-31.tar.gz) = b2061154650a19e6ce76dd8af46b0b8343f76b30fc594d398c355ca72bb581fbea466eb2060f7b0ae5bd1dda4538932dd804bcb6326f95d72bf6693e4983ac55 +SHA512 (ngspice-31-manual.pdf) = 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55 SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 From a531747b061ea9b6068ddf9e7bce4e84b3b42012 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Sep 2019 15:53:31 +0900 Subject: [PATCH 006/132] add patch --- ...void-get_plot-function-type-conflict.patch | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 0001-tclspice-avoid-get_plot-function-type-conflict.patch diff --git a/0001-tclspice-avoid-get_plot-function-type-conflict.patch b/0001-tclspice-avoid-get_plot-function-type-conflict.patch new file mode 100644 index 0000000..6e854c6 --- /dev/null +++ b/0001-tclspice-avoid-get_plot-function-type-conflict.patch @@ -0,0 +1,145 @@ +From 6b8eae324c03a257280f24725fd87ea49ce25bf5 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Wed, 25 Sep 2019 13:18:08 +0900 +Subject: [PATCH] tclspice: avoid get_plot function type conflict + +Due to change 40411197e0bfdc62eb19f0bc03dae34965e50e3a , tclspice cannot be compiled like: + +tclspice.c:214:1: error: conflicting types for 'get_plot' + 214 | get_plot(int plot) + | ^~~~~~~~ +In file included from ../src/include/ngspice/ftedefs.h:73, + from tclspice.c:84: +../src/include/ngspice/fteext.h:363:21: note: previous declaration of 'get_plot' was here + 363 | extern struct plot *get_plot(char* name); + | ^~~~~~~~ + +So change the name of get_plot() in tclspice.c internal to another name. +--- + src/tclspice.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/tclspice.c b/src/tclspice.c +index 0091b17ff..ff10db030 100644 +--- a/src/tclspice.c ++++ b/src/tclspice.c +@@ -211,7 +211,7 @@ int blt_plot(struct dvec *y, struct dvec *x, int new); + /*helper function*/ + /*inline*/ + static struct plot * +-get_plot(int plot) ++get_plot_by_index(int plot) + { + struct plot *pl; + pl = plot_list; +@@ -293,7 +293,7 @@ spice_data TCL_CMDPROCARGS(clientData, interp, argc, argv) + } else { + struct plot *pl; + struct dvec *v; +- if (!(pl = get_plot(atoi(argv[1])))) { ++ if (!(pl = get_plot_by_index(atoi(argv[1])))) { + Tcl_SetResult(interp, "Bad plot number", TCL_STATIC); + return TCL_ERROR; + } +@@ -882,7 +882,7 @@ plot_variables TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot given", TCL_STATIC); + return TCL_ERROR; + } +@@ -912,7 +912,7 @@ plot_variablesInfo TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot given", TCL_STATIC); + return TCL_ERROR; + } +@@ -948,7 +948,7 @@ plot_get_value TCL_CMDPROCARGS(clientData, interp, argc, argv) + plot = atoi(argv[2]); + index = atoi(argv[3]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +@@ -984,7 +984,7 @@ plot_datapoints TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +@@ -1011,7 +1011,7 @@ plot_title TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +@@ -1034,7 +1034,7 @@ plot_date TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +@@ -1056,7 +1056,7 @@ plot_name TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +@@ -1078,7 +1078,7 @@ plot_typename TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +@@ -1105,7 +1105,7 @@ plot_nvars TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +@@ -1131,7 +1131,7 @@ plot_defaultscale TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +@@ -1168,7 +1168,7 @@ plot_getvector TCL_CMDPROCARGS(clientData, interp, argc, argv) + + plot = atoi(argv[1]); + +- if (!(pl = get_plot(plot))) { ++ if (!(pl = get_plot_by_index(plot))) { + Tcl_SetResult(interp, "Bad plot", TCL_STATIC); + return TCL_ERROR; + } +-- +2.23.0 + From aeaf422c402ea17c0ee4a77fa164ae036493bc0b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Sep 2019 16:05:51 +0900 Subject: [PATCH 007/132] add reference --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 8a5ddc6..afdbf4a 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -39,7 +39,7 @@ Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{ve # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-26-blt-linkage-workaround.patch -# Needs upstream report +# reported: https://sourceforge.net/p/ngspice/patches/92/ Patch100: 0001-tclspice-avoid-get_plot-function-type-conflict.patch BuildRequires: gcc From 7d4497805d2d22a6e71fad6e5129134056d2d60a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 29 Sep 2019 21:52:39 +0900 Subject: [PATCH 008/132] 31 tarball respun --- ...void-get_plot-function-type-conflict.patch | 145 ------------------ ngspice.spec | 8 +- sources | 2 +- 3 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 0001-tclspice-avoid-get_plot-function-type-conflict.patch diff --git a/0001-tclspice-avoid-get_plot-function-type-conflict.patch b/0001-tclspice-avoid-get_plot-function-type-conflict.patch deleted file mode 100644 index 6e854c6..0000000 --- a/0001-tclspice-avoid-get_plot-function-type-conflict.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 6b8eae324c03a257280f24725fd87ea49ce25bf5 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Wed, 25 Sep 2019 13:18:08 +0900 -Subject: [PATCH] tclspice: avoid get_plot function type conflict - -Due to change 40411197e0bfdc62eb19f0bc03dae34965e50e3a , tclspice cannot be compiled like: - -tclspice.c:214:1: error: conflicting types for 'get_plot' - 214 | get_plot(int plot) - | ^~~~~~~~ -In file included from ../src/include/ngspice/ftedefs.h:73, - from tclspice.c:84: -../src/include/ngspice/fteext.h:363:21: note: previous declaration of 'get_plot' was here - 363 | extern struct plot *get_plot(char* name); - | ^~~~~~~~ - -So change the name of get_plot() in tclspice.c internal to another name. ---- - src/tclspice.c | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/tclspice.c b/src/tclspice.c -index 0091b17ff..ff10db030 100644 ---- a/src/tclspice.c -+++ b/src/tclspice.c -@@ -211,7 +211,7 @@ int blt_plot(struct dvec *y, struct dvec *x, int new); - /*helper function*/ - /*inline*/ - static struct plot * --get_plot(int plot) -+get_plot_by_index(int plot) - { - struct plot *pl; - pl = plot_list; -@@ -293,7 +293,7 @@ spice_data TCL_CMDPROCARGS(clientData, interp, argc, argv) - } else { - struct plot *pl; - struct dvec *v; -- if (!(pl = get_plot(atoi(argv[1])))) { -+ if (!(pl = get_plot_by_index(atoi(argv[1])))) { - Tcl_SetResult(interp, "Bad plot number", TCL_STATIC); - return TCL_ERROR; - } -@@ -882,7 +882,7 @@ plot_variables TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot given", TCL_STATIC); - return TCL_ERROR; - } -@@ -912,7 +912,7 @@ plot_variablesInfo TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot given", TCL_STATIC); - return TCL_ERROR; - } -@@ -948,7 +948,7 @@ plot_get_value TCL_CMDPROCARGS(clientData, interp, argc, argv) - plot = atoi(argv[2]); - index = atoi(argv[3]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } -@@ -984,7 +984,7 @@ plot_datapoints TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } -@@ -1011,7 +1011,7 @@ plot_title TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } -@@ -1034,7 +1034,7 @@ plot_date TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } -@@ -1056,7 +1056,7 @@ plot_name TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } -@@ -1078,7 +1078,7 @@ plot_typename TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } -@@ -1105,7 +1105,7 @@ plot_nvars TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } -@@ -1131,7 +1131,7 @@ plot_defaultscale TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } -@@ -1168,7 +1168,7 @@ plot_getvector TCL_CMDPROCARGS(clientData, interp, argc, argv) - - plot = atoi(argv[1]); - -- if (!(pl = get_plot(plot))) { -+ if (!(pl = get_plot_by_index(plot))) { - Tcl_SetResult(interp, "Bad plot", TCL_STATIC); - return TCL_ERROR; - } --- -2.23.0 - diff --git a/ngspice.spec b/ngspice.spec index afdbf4a..75ec59f 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -22,7 +22,7 @@ Version: 31 %if %{?devel} %global snap .20111129cvs %endif -Release: 1%{?snap}%{?dist} +Release: 2%{?snap}%{?dist}.respin1 Summary: A mixed level/signal circuit simulator License: BSD @@ -39,8 +39,6 @@ Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{ve # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-26-blt-linkage-workaround.patch -# reported: https://sourceforge.net/p/ngspice/patches/92/ -Patch100: 0001-tclspice-avoid-get_plot-function-type-conflict.patch BuildRequires: gcc @@ -123,7 +121,6 @@ cd ng-spice-rework %setup -q -a 2 %endif %patch0 -p2 -b .link -%patch100 -p1 -b .name # make sure the examples are UTF-8... for nonUTF8 in \ @@ -371,6 +368,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Sun Sep 29 2019 Mamoru TASAKA - 31-2.respin1 +- 31 tarball respun + * Wed Sep 25 2019 Mamoru TASAKA - 31-1 - Update to 31 diff --git a/sources b/sources index 2740ed9..9154622 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-31.tar.gz) = b2061154650a19e6ce76dd8af46b0b8343f76b30fc594d398c355ca72bb581fbea466eb2060f7b0ae5bd1dda4538932dd804bcb6326f95d72bf6693e4983ac55 +SHA512 (ngspice-31.tar.gz) = 95d61fe4acdba8b4d8c22eeb2cff5e49976d324e93fdcf6b88b73d59a679bc9a6e7d2b39c3523dface52a2653533830c627259be8171794f1f363a573add1cef SHA512 (ngspice-31-manual.pdf) = 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55 SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 From 84512a63222954545e90950c994f3bfe7bc8d3b9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Oct 2019 18:24:19 +0900 Subject: [PATCH 009/132] 31 tarball again respun --- ngspice.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 75ec59f..1da28d3 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -22,7 +22,7 @@ Version: 31 %if %{?devel} %global snap .20111129cvs %endif -Release: 2%{?snap}%{?dist}.respin1 +Release: 3%{?snap}%{?dist}.respin2 Summary: A mixed level/signal circuit simulator License: BSD @@ -368,6 +368,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Mon Oct 7 2019 Mamoru TASAKA - 31-3.respin2 +- 31 tarball again respun + * Sun Sep 29 2019 Mamoru TASAKA - 31-2.respin1 - 31 tarball respun diff --git a/sources b/sources index 9154622..aeffb6c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (ngspice-31.tar.gz) = 95d61fe4acdba8b4d8c22eeb2cff5e49976d324e93fdcf6b88b73d59a679bc9a6e7d2b39c3523dface52a2653533830c627259be8171794f1f363a573add1cef -SHA512 (ngspice-31-manual.pdf) = 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55 SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 +SHA512 (ngspice-31-manual.pdf) = 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55 From 3927f163bf8f51479a0b8312340928b3507d07df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:59:13 +0000 Subject: [PATCH 010/132] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 1da28d3..3b5036a 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -22,7 +22,7 @@ Version: 31 %if %{?devel} %global snap .20111129cvs %endif -Release: 3%{?snap}%{?dist}.respin2 +Release: 4%{?snap}%{?dist}.respin2 Summary: A mixed level/signal circuit simulator License: BSD @@ -368,6 +368,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 31-4.respin2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Oct 7 2019 Mamoru TASAKA - 31-3.respin2 - 31 tarball again respun From 43fa62d918fa0a8eda1824c821699b8fa7fc2d41 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 May 2020 01:44:10 +0900 Subject: [PATCH 011/132] Update to 32 Use upstream git to use some upstream fixes since release --- .gitignore | 2 + create-ngspice-git-bare-tarball.sh | 28 ++++++ ngspice-32-gcc10-nocommon.patch | 22 +++++ ngspice.spec | 151 ++++++++++++++++++----------- sources | 4 +- 5 files changed, 147 insertions(+), 60 deletions(-) create mode 100644 create-ngspice-git-bare-tarball.sh create mode 100644 ngspice-32-gcc10-nocommon.patch diff --git a/.gitignore b/.gitignore index d9077ea..6d2cee0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-30-manual.pdf /ngspice-31.tar.gz /ngspice-31-manual.pdf +/ngspice-20200505T2059.tar.gz +/ngspice-32-manual.pdf diff --git a/create-ngspice-git-bare-tarball.sh b/create-ngspice-git-bare-tarball.sh new file mode 100644 index 0000000..93333e8 --- /dev/null +++ b/create-ngspice-git-bare-tarball.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -x +set -e + +REPONAME=ngspice +GITURL=https://git.code.sf.net/p/ngspice/${REPONAME}.git + +DATE=$(date '+%Y%m%d') +TIME=$(date '+%H%M') + +TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz + +PWDDIR=$(pwd) +TMPDIR=$(mktemp -d /var/tmp/ngspice-XXXXXX) +pushd $TMPDIR + +git clone --mirror $GITURL + +cd ./${REPONAME}.git +git log | head -n 5 +cd .. + +tar czf ${TARNAME} ${REPONAME}.git/ + +cp -p ${TARNAME} $PWDDIR +popd +rm -rf $TMPDIR diff --git a/ngspice-32-gcc10-nocommon.patch b/ngspice-32-gcc10-nocommon.patch new file mode 100644 index 0000000..50d74e3 --- /dev/null +++ b/ngspice-32-gcc10-nocommon.patch @@ -0,0 +1,22 @@ +--- ngspice-32/src/xspice/icm/dlmain.h.gcc10 2020-05-03 16:35:31.000000000 +0900 ++++ ngspice-32/src/xspice/icm/dlmain.h 2020-05-05 15:22:20.263239365 +0900 +@@ -5,6 +5,6 @@ + #include "ngspice/mifproto.h" + #include "ngspice/dllitf.h" + +-struct coreInfo_t *coreitf; ++extern struct coreInfo_t *coreitf; + + #endif /* dlmain.h */ +diff --git a/src/ngsconvert.c b/src/ngsconvert.c +index f8a7a5176..6e09b9033 100644 +--- a/src/ngsconvert.c ++++ b/src/ngsconvert.c +@@ -24,7 +24,6 @@ FILE *cp_err = NULL; + FILE *cp_curin = NULL; + FILE *cp_curout = NULL; + FILE *cp_curerr = NULL; +-int cp_maxhistlength; + bool cp_debug = FALSE; + char cp_chars[128]; + bool cp_nocc = TRUE; diff --git a/ngspice.spec b/ngspice.spec index 3b5036a..d66bd0e 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,40 +5,61 @@ # - 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-23.`date '+%Y%m%d'`cvs.tar.bz2 ngspice +%global userelease 0 +%global usegitbare 1 -# Toggle the following declaration when using version controlled snapshots -%global devel 0 +%if 0%{?usegitbare} < 1 +# force +%global userelease 1 +%endif + +%global mainver 32 +%undefine prever +%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') + +%global mainrel 1 + +%if 0%{?usegitbare} >= 1 +%global gitcommit bbe81ca8f86a8648aa698c2b95fafcd4ba98b73f +%global gitdate 20200405 +%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) + +%global tarballdate 20200505 +%global tarballtime 2059 +%endif + +%if 0%{?userelease} >= 1 +%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%endif +%if 0%{?usegitbare} >= 1 +%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} +%endif %undefine _changelog_trimtime Name: ngspice -Version: 31 -%if %{?devel} -%global snap .20111129cvs -%endif -Release: 4%{?snap}%{?dist}.respin2 +Version: %{mainver} +Release: %{fedorarel}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD URL: http://ngspice.sourceforge.net -%if %{?devel} -Source0: ngspice-rework-%{version}%{snap}.tar.bz2 -%else +%if 0%{?userelease} >= 1 Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-%{version}.tar.gz +%endif +%if 0%{?usegitbare} >= 1 +Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz +%endif Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-%{version}-manual.pdf Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ng_adms_va.tar.gz -%endif +Source10: create-ngspice-git-bare-tarball.sh + # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-26-blt-linkage-workaround.patch +Patch11: ngspice-32-gcc10-nocommon.patch BuildRequires: gcc @@ -49,18 +70,23 @@ BuildRequires: libICE-devel BuildRequires: libXaw-devel BuildRequires: libGL-devel BuildRequires: libXt-devel +# From ngspice 32 +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel +BuildRequires: libXft-devel +BuildRequires: libXrender-devel BuildRequires: automake BuildRequires: libtool -%if %{?devel} -BuildRequires: lyx -%endif BuildRequires: bison BuildRequires: byacc BuildRequires: flex + BuildRequires: ImageMagick BuildRequires: mot-adms +BuildRequires: git + Obsoletes: ngspice-doc < 20-4.cvs20100619 Provides: ngspice-doc = %{version}-%{release} @@ -114,13 +140,31 @@ developing applications that use libngspice. %prep -%if %{?devel} -%setup -q -n ngspice -cd ng-spice-rework -%else -%setup -q -a 2 +%if 0%{?userelease} >= 1 +%setup -q +git init +git config user.name "%{name} maintainer" +git config user.email "%{name}-owner@fedoraproject.org" +git add . +git commit -m "base" -a %endif + +%if 0%{?usegitbare} >= 1 +%setup -q -c -T -a 0 +git clone ./%{name}.git/ +cd %{name} +git config user.name "%{name} maintainer" +git config user.email "%{name}-owner@fedoraproject.org" + +git checkout -b %{name}-%{version}-fedora %{gitcommit} +%endif + +cat %{SOURCE2} | gzip -dc | tar xof - + %patch0 -p2 -b .link +git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +%patch11 -p1 -b .nocommon +git commit -m "Fix for gcc10 -fno-common" -a # make sure the examples are UTF-8... for nonUTF8 in \ @@ -133,6 +177,7 @@ do %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv %{__mv} -f $nonUTF8.conv $nonUTF8 done +git commit -m "Change files to UTF8" -a # rpmlint warnings find examples/ -type f -name ".cvsignore" -exec rm -rf {} ';' @@ -140,11 +185,7 @@ 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 {} ';' - -%ifarch x86_64 sparc64 ppc64 amd64 -sed -i "s|@XSPICEINIT@ codemodel @prefix@/@libname@|@XSPICEINIT@ codemodel %{_libdir}|" \ - src/spinit.in -%endif +git commit -m "Fix permission" -a || : # Fix Tclspice's examples sed -i \ @@ -156,26 +197,23 @@ sed -i \ sed -i \ 's|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice2poly|' \ examples/tclspice/tcl-testbench*/tcl-testbench*.sh +git commit -m "Fix Tclspice's examples" -a # Fixed minor CVS build sed -i \ "s|AM_CPPFLAGS =|AM_CPPFLAGS = -I\$(top_srcdir)/src/maths/ni |" \ src/spicelib/analysis/Makefile.am +git commit -m "Fix include path" -a export ACLOCAL_FLAGS=-Im4 ./autogen.sh --adms +git commit -m "Execute autogen" -a || : chmod +x configure %build -%if %{?devel} -# ---- Manual ---------------------------------------------------------------- -cd ng-spice-manuals -autoreconf -Wno-portability --install -%configure ; make -cd .. - -cd ng-spice-rework +%if 0%{?usegitbare} >= 1 +cd %{name} %endif # ---- Tclspice ---------------------------------------------------------------- @@ -191,12 +229,6 @@ cd tclspice sed -i \ 's|\#define NGSPICEDATADIR "\`echo \$dprefix/share/ngspice\`"|\#define NGSPICEDATADIR "\`echo %{_libdir}/tclspice\`"|' \ configure* -# fix ng-spice-manuals directory location -%if %{?devel} -sed -i \ - 's|../ng-spice-manuals|../../ng-spice-manuals|g' \ - manual/Makefile.am -%endif # direct access to Tcl_Interp->result deprecated in tcl8.6, # remaining usage cannot be replaced by Tcl_SetResult @@ -227,7 +259,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --enable-oldapps \ %{nil} -%{__make} +%{__make} -k # Once install to the temp dir rm -rf $(pwd)/../INST-TCLSPICE %{__make} INSTALL="install -p" install DESTDIR=$(pwd)/../INST-TCLSPICE @@ -257,8 +289,8 @@ do %{nil} %{__make} clean -%{__make} -# %{?_smp_mflags} +# No parallel make +%{__make} -k # Once install to the temp dir rm -rf $(pwd)/INST-NGSPICE-${opt} %{__make} INSTALL="install -p" install DESTDIR=$(pwd)/INST-NGSPICE-${opt} @@ -267,8 +299,9 @@ find $(pwd)/INST-NGSPICE-${opt} -type f | sort done %install -%if %{?devel} -cd ng-spice-rework +%if 0%{?usegitbare} >= 1 +cp -p %{name}/COPYING . +cd %{name} %endif # ---- Tclspice ---------------------------------------------------------------- @@ -279,7 +312,10 @@ rm -rf ./%{_datadir}/ngspice/include/ # see bug 1311869 rm -f ./%{_datadir}/ngspice/scripts/spinit # binary differ -mv .%{_bindir}/cmpp{,-tclspice} +# for --short-circuit +if [ -f .%{_bindir}/cmpp ] ; then + mv .%{_bindir}/cmpp{,-tclspice} +fi popd # Install @@ -307,11 +343,7 @@ cp -pr ./src/spicelib/devices/adms/ %{buildroot}%{_datadir}/%{name} # Ensuring that all docs are under %%{_pkgdocdir} mkdir -p %{buildroot}%{_pkgdocdir} cp -pr examples/ %{buildroot}%{_pkgdocdir} -%if %{?devel} -cp -p ../ng-spice-manuals/manual.pdf %{buildroot}%{_pkgdocdir}/%{name}-%{version}.pdf -%else install -cpm 0644 %{SOURCE1} %{buildroot}%{_pkgdocdir}/%{name}-%{version}.pdf -%endif cp -a \ Stuarts_Poly_Notes \ @@ -332,11 +364,10 @@ chmod +x %{buildroot}%{_libdir}/ngspice/*.cm chmod +x %{buildroot}%{_libdir}/tclspice/ngspice/*.cm %check -%if %{?devel} -cd ng-spice-rework/tests -%else -cd tests +%if 0%{?usegitbare} >= 1 +cd %{name} %endif +cd tests #make check %files @@ -368,6 +399,10 @@ cd tests %{_includedir}/ngspice/ %changelog +* Tue May 5 2020 Mamoru TASAKA - 32-1.D20200405gitbbe81ca +- Update to 32 +- Use upstream git to use some upstream fixes since release + * Wed Jan 29 2020 Fedora Release Engineering - 31-4.respin2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index aeffb6c..7a5916f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-31.tar.gz) = 95d61fe4acdba8b4d8c22eeb2cff5e49976d324e93fdcf6b88b73d59a679bc9a6e7d2b39c3523dface52a2653533830c627259be8171794f1f363a573add1cef +SHA512 (ngspice-20200505T2059.tar.gz) = f3c10dd1afb9df4b3a7af2f4712b22fdeb7e29224ac48f00c817e606a32452c9c46fb63981182675894f8fbc9154d0e1d1bb77f3946620091547504e082b7618 +SHA512 (ngspice-32-manual.pdf) = 1e4902bda97e8d26b0e38a6ce4e0fc25af7ae505308cba88da281323229a0cd39907581373e9fc59140ce9a0259a8411bb581d8cae94f18eb74283e774a9b93f SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 -SHA512 (ngspice-31-manual.pdf) = 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55 From e3cd1b234b9508cdc474a4c0b713ecad16a56ab3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 May 2020 10:33:53 +0900 Subject: [PATCH 012/132] 32.2 tagged --- .gitignore | 1 + ngspice-32-gcc10-nocommon.patch | 22 ---------------------- ngspice.spec | 21 +++++++++++---------- sources | 2 +- 4 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 ngspice-32-gcc10-nocommon.patch diff --git a/.gitignore b/.gitignore index 6d2cee0..15aa479 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-31-manual.pdf /ngspice-20200505T2059.tar.gz /ngspice-32-manual.pdf +/ngspice-20200506T0950.tar.gz diff --git a/ngspice-32-gcc10-nocommon.patch b/ngspice-32-gcc10-nocommon.patch deleted file mode 100644 index 50d74e3..0000000 --- a/ngspice-32-gcc10-nocommon.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ngspice-32/src/xspice/icm/dlmain.h.gcc10 2020-05-03 16:35:31.000000000 +0900 -+++ ngspice-32/src/xspice/icm/dlmain.h 2020-05-05 15:22:20.263239365 +0900 -@@ -5,6 +5,6 @@ - #include "ngspice/mifproto.h" - #include "ngspice/dllitf.h" - --struct coreInfo_t *coreitf; -+extern struct coreInfo_t *coreitf; - - #endif /* dlmain.h */ -diff --git a/src/ngsconvert.c b/src/ngsconvert.c -index f8a7a5176..6e09b9033 100644 ---- a/src/ngsconvert.c -+++ b/src/ngsconvert.c -@@ -24,7 +24,6 @@ FILE *cp_err = NULL; - FILE *cp_curin = NULL; - FILE *cp_curout = NULL; - FILE *cp_curerr = NULL; --int cp_maxhistlength; - bool cp_debug = FALSE; - char cp_chars[128]; - bool cp_nocc = TRUE; diff --git a/ngspice.spec b/ngspice.spec index d66bd0e..0263392 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -13,26 +13,27 @@ %global userelease 1 %endif -%global mainver 32 +%global mainver 32.2 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %global mainrel 1 %if 0%{?usegitbare} >= 1 -%global gitcommit bbe81ca8f86a8648aa698c2b95fafcd4ba98b73f -%global gitdate 20200405 +%global gitcommit 5c3e2b6526b22015ddec692450f5c5077efa1d80 +%global gitdate 20200505 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20200505 -%global tarballtime 2059 +%global tarballdate 20200506 +%global tarballtime 0950 %endif %if 0%{?userelease} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?usegitbare} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} +#%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} +%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %undefine _changelog_trimtime @@ -59,7 +60,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-26-blt-linkage-workaround.patch -Patch11: ngspice-32-gcc10-nocommon.patch BuildRequires: gcc @@ -163,8 +163,6 @@ cat %{SOURCE2} | gzip -dc | tar xof - %patch0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -%patch11 -p1 -b .nocommon -git commit -m "Fix for gcc10 -fno-common" -a # make sure the examples are UTF-8... for nonUTF8 in \ @@ -399,7 +397,10 @@ cd tests %{_includedir}/ngspice/ %changelog -* Tue May 5 2020 Mamoru TASAKA - 32-1.D20200405gitbbe81ca +* Wed May 6 2020 Mamoru TASAKA - 32.2-1 +- 32.2 tagged + +* Tue May 5 2020 Mamoru TASAKA - 32-1.D20200505gitbbe81ca - Update to 32 - Use upstream git to use some upstream fixes since release diff --git a/sources b/sources index 7a5916f..09df0fe 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20200505T2059.tar.gz) = f3c10dd1afb9df4b3a7af2f4712b22fdeb7e29224ac48f00c817e606a32452c9c46fb63981182675894f8fbc9154d0e1d1bb77f3946620091547504e082b7618 +SHA512 (ngspice-20200506T0950.tar.gz) = 610450a0f32421efd7cef9c238dc4274cf6024ec527e5a070e673e43011a57251c4ef419b429cf15247d781f0bcd065c1b1ff01691952ef572046a3e6ddeb70f SHA512 (ngspice-32-manual.pdf) = 1e4902bda97e8d26b0e38a6ce4e0fc25af7ae505308cba88da281323229a0cd39907581373e9fc59140ce9a0259a8411bb581d8cae94f18eb74283e774a9b93f SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 From cd4963627aae9ca56ace98712d470ade3ca9b0cc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 May 2020 10:39:10 +0900 Subject: [PATCH 013/132] fix source entry --- ngspice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 0263392..852e729 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -14,6 +14,7 @@ %endif %global mainver 32.2 +%global docver 32 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -52,7 +53,7 @@ Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{ve %if 0%{?usegitbare} >= 1 Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz %endif -Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-%{version}-manual.pdf +Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-%{docver}-manual.pdf Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ng_adms_va.tar.gz Source10: create-ngspice-git-bare-tarball.sh From 1b3379e9a8c8076b81e7d75b4d2d8d48e1fe5280 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 09:09:27 +0000 Subject: [PATCH 014/132] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 852e729..a13a4be 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: A mixed level/signal circuit simulator License: BSD @@ -398,6 +398,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 32.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed May 6 2020 Mamoru TASAKA - 32.2-1 - 32.2 tagged From 6fbfe3197c71f1d8b695bb5517674eac6f963e33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:39:58 +0000 Subject: [PATCH 015/132] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index a13a4be..2cfe0fc 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: A mixed level/signal circuit simulator License: BSD @@ -398,6 +398,10 @@ cd tests %{_includedir}/ngspice/ %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 32.2-1.2 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 32.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4e25a02cb8cdc78125f0a612f28b7d4438028a7e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Oct 2020 23:56:20 +0900 Subject: [PATCH 016/132] git head (20200809) --- .gitignore | 1 + ngspice.spec | 19 +++++++++++-------- sources | 4 +--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 15aa479..9af8d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-20200505T2059.tar.gz /ngspice-32-manual.pdf /ngspice-20200506T0950.tar.gz +/ngspice-20201008T2226.tar.gz diff --git a/ngspice.spec b/ngspice.spec index 2cfe0fc..2f97733 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -18,30 +18,30 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 5c3e2b6526b22015ddec692450f5c5077efa1d80 -%global gitdate 20200505 +%global gitcommit a0389bb5471a43bc828b08b81bd3fc1693200130 +%global gitdate 20200809 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20200506 -%global tarballtime 0950 +%global tarballdate 20201008 +%global tarballtime 2226 %endif %if 0%{?userelease} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?usegitbare} >= 1 -#%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} +#%%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %undefine _changelog_trimtime Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -398,6 +398,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Sat Oct 8 2020 Mamoru TASAKA +- git head (20200809) + * Sat Aug 01 2020 Fedora Release Engineering - 32.2-1.2 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 09df0fe..cf2fb91 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (ngspice-20200506T0950.tar.gz) = 610450a0f32421efd7cef9c238dc4274cf6024ec527e5a070e673e43011a57251c4ef419b429cf15247d781f0bcd065c1b1ff01691952ef572046a3e6ddeb70f -SHA512 (ngspice-32-manual.pdf) = 1e4902bda97e8d26b0e38a6ce4e0fc25af7ae505308cba88da281323229a0cd39907581373e9fc59140ce9a0259a8411bb581d8cae94f18eb74283e774a9b93f -SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 +SHA512 (ngspice-20201008T2226.tar.gz) = 0223f67fb86708ab9623e05602f71ff63cf54a20587b9e3d94d6270f5e2e65914ce3118aaf9ac458b4aae9631a45eb61b13ff3983e81422965d8785a3664c715 From af775aa5e97bb209ad2dbe5aa8d61479485e1e56 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Oct 2020 23:59:08 +0900 Subject: [PATCH 017/132] add files again --- sources | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources b/sources index cf2fb91..dbeb9cc 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (ngspice-20201008T2226.tar.gz) = 0223f67fb86708ab9623e05602f71ff63cf54a20587b9e3d94d6270f5e2e65914ce3118aaf9ac458b4aae9631a45eb61b13ff3983e81422965d8785a3664c715 +SHA512 (ngspice-32-manual.pdf) = 1e4902bda97e8d26b0e38a6ce4e0fc25af7ae505308cba88da281323229a0cd39907581373e9fc59140ce9a0259a8411bb581d8cae94f18eb74283e774a9b93f +SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 From f172cb76ebd70bb5d5def4d2053f6cf99b25be25 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 11 Oct 2020 22:40:25 +0900 Subject: [PATCH 018/132] new snapshot --- .gitignore | 1 + ngspice.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9af8d2c..90a03f3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-32-manual.pdf /ngspice-20200506T0950.tar.gz /ngspice-20201008T2226.tar.gz +/ngspice-20201011T2051.tar.gz diff --git a/ngspice.spec b/ngspice.spec index 2f97733..0cda34d 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit a0389bb5471a43bc828b08b81bd3fc1693200130 -%global gitdate 20200809 +%global gitcommit 390b699b89ea27979da333ad643d1b9f69f7e148 +%global gitdate 20201011 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20201008 -%global tarballtime 2226 +%global tarballdate 20201011 +%global tarballtime 2051 %endif %if 0%{?userelease} >= 1 @@ -398,8 +398,8 @@ cd tests %{_includedir}/ngspice/ %changelog -* Sat Oct 8 2020 Mamoru TASAKA -- git head (20200809) +* Sun Oct 11 2020 Mamoru TASAKA +- git head (20201010) * Sat Aug 01 2020 Fedora Release Engineering - 32.2-1.2 - Second attempt - Rebuilt for diff --git a/sources b/sources index dbeb9cc..75b7958 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20201008T2226.tar.gz) = 0223f67fb86708ab9623e05602f71ff63cf54a20587b9e3d94d6270f5e2e65914ce3118aaf9ac458b4aae9631a45eb61b13ff3983e81422965d8785a3664c715 +SHA512 (ngspice-20201011T2051.tar.gz) = a1d20c6d796ce117dfce58ad0b2b28d6dd6342560b9c07ed5e8fc3db41f04a22507b1c13d962d332944906a0747ab97f1293c9c42c14c4a21bb7c5358a463928 SHA512 (ngspice-32-manual.pdf) = 1e4902bda97e8d26b0e38a6ce4e0fc25af7ae505308cba88da281323229a0cd39907581373e9fc59140ce9a0259a8411bb581d8cae94f18eb74283e774a9b93f SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 From f6375c5ab9280dfd4ac88f507a9e1c8cd6a14ed2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 17 Oct 2020 15:37:58 +0900 Subject: [PATCH 019/132] git head (20201016) --- .gitignore | 1 + ngspice.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 90a03f3..9340612 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-20200506T0950.tar.gz /ngspice-20201008T2226.tar.gz /ngspice-20201011T2051.tar.gz +/ngspice-20201017T1145.tar.gz diff --git a/ngspice.spec b/ngspice.spec index 0cda34d..b44324a 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 390b699b89ea27979da333ad643d1b9f69f7e148 -%global gitdate 20201011 +%global gitcommit 798d2b2db121b4c6514f977e30d0636edf3ca789 +%global gitdate 20201016 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20201011 -%global tarballtime 2051 +%global tarballdate 20201017 +%global tarballtime 1145 %endif %if 0%{?userelease} >= 1 @@ -398,8 +398,8 @@ cd tests %{_includedir}/ngspice/ %changelog -* Sun Oct 11 2020 Mamoru TASAKA -- git head (20201010) +* Sat Oct 17 2020 Mamoru TASAKA +- git head (20201016) * Sat Aug 01 2020 Fedora Release Engineering - 32.2-1.2 - Second attempt - Rebuilt for diff --git a/sources b/sources index 75b7958..9e63a99 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20201011T2051.tar.gz) = a1d20c6d796ce117dfce58ad0b2b28d6dd6342560b9c07ed5e8fc3db41f04a22507b1c13d962d332944906a0747ab97f1293c9c42c14c4a21bb7c5358a463928 +SHA512 (ngspice-20201017T1145.tar.gz) = d8ad0a3f98001d5f975373804e636d464e3d6969866c39edc694df4b7b49780ead6ae4acb837a7d6c7e3a12cc8b3a6bcad9a193f938f76b950bb5629d8b90428 SHA512 (ngspice-32-manual.pdf) = 1e4902bda97e8d26b0e38a6ce4e0fc25af7ae505308cba88da281323229a0cd39907581373e9fc59140ce9a0259a8411bb581d8cae94f18eb74283e774a9b93f SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 From a90428f1b3a68e77d74d110a2692613b6c9fb4b2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 19 Oct 2020 09:28:22 +0900 Subject: [PATCH 020/132] Update to 33 --- .gitignore | 2 ++ ngspice.spec | 14 +++++++------- sources | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9340612..04edb7e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-20201008T2226.tar.gz /ngspice-20201011T2051.tar.gz /ngspice-20201017T1145.tar.gz +/ngspice-33.tar.gz +/ngspice-33-manual.pdf diff --git a/ngspice.spec b/ngspice.spec index b44324a..4b3db62 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,20 +5,20 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global mainver 32.2 -%global docver 32 +%global mainver 33 +%global docver 33 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 2 +%global mainrel 1 %if 0%{?usegitbare} >= 1 %global gitcommit 798d2b2db121b4c6514f977e30d0636edf3ca789 @@ -398,8 +398,8 @@ cd tests %{_includedir}/ngspice/ %changelog -* Sat Oct 17 2020 Mamoru TASAKA -- git head (20201016) +* Mon Oct 19 2020 Mamoru TASAKA - 33-1 +- Update to 33 * Sat Aug 01 2020 Fedora Release Engineering - 32.2-1.2 - Second attempt - Rebuilt for diff --git a/sources b/sources index 9e63a99..cf79886 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20201017T1145.tar.gz) = d8ad0a3f98001d5f975373804e636d464e3d6969866c39edc694df4b7b49780ead6ae4acb837a7d6c7e3a12cc8b3a6bcad9a193f938f76b950bb5629d8b90428 -SHA512 (ngspice-32-manual.pdf) = 1e4902bda97e8d26b0e38a6ce4e0fc25af7ae505308cba88da281323229a0cd39907581373e9fc59140ce9a0259a8411bb581d8cae94f18eb74283e774a9b93f +SHA512 (ngspice-33.tar.gz) = 895e39f7de185df18bf443a9fa5691cdb3bf0a5091d9860d20ccb02254ef396a4cca5a1c8bf4ba19a03783fc89bb86649218cee977b0fe4565d3c84548943c09 SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 +SHA512 (ngspice-33-manual.pdf) = 0cb5bbc33f6bdce639454b1558bbe322250b4525568440812466da09194bff2f2220bf0f9b267cac42b233ebe1f64068d3438901cd7b007701696526e3822e0e From 1a6273223220ccd6b3b282d7eb03f7ebb4dabc5d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 05:51:21 +0000 Subject: [PATCH 021/132] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ngspice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ngspice.spec b/ngspice.spec index 4b3db62..3cc06f4 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -62,6 +62,7 @@ Source10: create-ngspice-git-bare-tarball.sh # not (bug 1047056, debian bug 737279) Patch0: ngspice-26-blt-linkage-workaround.patch +BuildRequires: make BuildRequires: gcc BuildRequires: readline-devel From 4e4eb0762c63c60278d0cf81ff8082fd5c0c3f6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:31:20 +0000 Subject: [PATCH 022/132] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 3cc06f4..b0ebf57 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: A mixed level/signal circuit simulator License: BSD @@ -399,6 +399,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 33-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Oct 19 2020 Mamoru TASAKA - 33-1 - Update to 33 From dac39752903d40357d46f29efc8524bed7219f82 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Feb 2021 22:55:09 +0900 Subject: [PATCH 023/132] Update to 34 Don't enable --enable-oldapps cmpp not installed any more header file inclusion change --- .gitignore | 3 +++ ngspice.spec | 26 ++++++++++++++++---------- sources | 6 +++--- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 04edb7e..5db286f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-20201017T1145.tar.gz /ngspice-33.tar.gz /ngspice-33-manual.pdf +/ngspice-34.tar.gz +/ngspice-34-manual.pdf +/ngspice-adms-va.7z diff --git a/ngspice.spec b/ngspice.spec index b0ebf57..203c834 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -13,8 +13,8 @@ %global userelease 1 %endif -%global mainver 33 -%global docver 33 +%global mainver 34 +%global docver 34 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -54,7 +54,7 @@ Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{ve Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz %endif Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-%{docver}-manual.pdf -Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ng_adms_va.tar.gz +Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-adms-va.7z Source10: create-ngspice-git-bare-tarball.sh @@ -62,8 +62,9 @@ Source10: create-ngspice-git-bare-tarball.sh # not (bug 1047056, debian bug 737279) Patch0: ngspice-26-blt-linkage-workaround.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc +BuildRequires: p7zip BuildRequires: readline-devel BuildRequires: libXext-devel @@ -161,7 +162,9 @@ git config user.email "%{name}-owner@fedoraproject.org" git checkout -b %{name}-%{version}-fedora %{gitcommit} %endif -cat %{SOURCE2} | gzip -dc | tar xof - +pushd src/spicelib/devices/adms +7za x %{SOURCE2} +popd %patch0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a @@ -256,7 +259,6 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --with-readline=yes \ --with-tcl=%{_libdir}/ \ --libdir=%{_libdir}/tclspice \ - --enable-oldapps \ %{nil} %{__make} -k @@ -285,7 +287,6 @@ do --enable-shared \ --with-readline=yes \ --libdir=%{_libdir} \ - --enable-oldapps \ %{nil} %{__make} clean @@ -330,6 +331,7 @@ cp -a INST-TCLSPICE/* %{buildroot} %{buildroot}%{_libdir}/tclspice/libspice.la \ %{buildroot}%{_libdir}/tclspice/libspicelite.la \ %{buildroot}%{_libdir}/libngspice.la \ + %{buildroot}%{_includedir}/config.h \ %{nil} # ------------------------------------------------------------------------------ @@ -372,7 +374,6 @@ cd tests %files %{_bindir}/* -%exclude %{_bindir}/cmpp-tclspice %{_datadir}/%{name}/ %exclude %{_datadir}/%{name}/scripts/tclspinit %{_libdir}/ngspice/ @@ -383,7 +384,6 @@ cd tests %license COPYING %files -n tclspice -%{_bindir}/cmpp-tclspice %doc %{_pkgdocdir}/examples/tclspice %{_libdir}/tclspice/ %dir %{_datadir}/ngspice @@ -399,6 +399,12 @@ cd tests %{_includedir}/ngspice/ %changelog +* Tue Feb 2 2021 Mamoru TASAKA - 34-1 +- Update to 34 + - Don't enable --enable-oldapps + - cmpp not installed any more + - header file inclusion change + * Tue Jan 26 2021 Fedora Release Engineering - 33-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index cf79886..415ef6d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-33.tar.gz) = 895e39f7de185df18bf443a9fa5691cdb3bf0a5091d9860d20ccb02254ef396a4cca5a1c8bf4ba19a03783fc89bb86649218cee977b0fe4565d3c84548943c09 -SHA512 (ng_adms_va.tar.gz) = fc47f1f1c73ec72b0e36d1b03869ddec64ea8777d404c059f362a4a7bdad164a3267a7b022fc6ddf8d3c5a0188493b1586754dfcb7cd39e42a2733a9f2a9dac6 -SHA512 (ngspice-33-manual.pdf) = 0cb5bbc33f6bdce639454b1558bbe322250b4525568440812466da09194bff2f2220bf0f9b267cac42b233ebe1f64068d3438901cd7b007701696526e3822e0e +SHA512 (ngspice-34.tar.gz) = 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8 +SHA512 (ngspice-34-manual.pdf) = b53f9161b793223015a307ba607add4e540ad22f252c2f6e3c6deedfc3fde173ec290bbc4939d4e419321cad6a68218f6a9c9b4c7620ee01da86eabfc22e5b7e +SHA512 (ngspice-adms-va.7z) = 923eac7e9d46e65aacda05657600bebae257f88aa8ed6f8dac7a21fd921463ca370047f2db2a2b95e1f8f340759b2888f49a2213939ef1e54e345bd6e2981b20 From d769dadbb5bcd6b7621ac9a7ac73e9dccf690c18 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Feb 2021 23:21:00 +0900 Subject: [PATCH 024/132] add BR: g++ --- ngspice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ngspice.spec b/ngspice.spec index 203c834..0756f5e 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -64,6 +64,7 @@ Patch0: ngspice-26-blt-linkage-workaround.patch BuildRequires: make BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: p7zip BuildRequires: readline-devel From 75147fca5b0c8b51192eb0e6fea573cd7d8029da Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Feb 2021 16:12:53 +0900 Subject: [PATCH 025/132] build --with-ngshared with --with-readline=no to aviod missing symbol for history_file, requested by the upstream --- ngspice.spec | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 0756f5e..299679b 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -18,7 +18,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global mainrel 2 %if 0%{?usegitbare} >= 1 %global gitcommit 798d2b2db121b4c6514f977e30d0636edf3ca789 @@ -269,11 +269,21 @@ rm -rf $(pwd)/../INST-TCLSPICE cd .. # ------------------------------------------------------------------------------ -for opt in with-ngshared without-ngshared +for opt in SHARED NOSHARED do + SHARED_OPT="" + if test x$opt == xSHARED + then + SHARED_OPT="$SHARED_OPT --with-ngshared" + # bug 1927628 + SHARED_OPT="$SHARED_OPT --with-readline=no" + else + SHARED_OPT="$SHARED_OPT --without-ngshared" + SHARED_OPT="$SHARED_OPT --with-readline=yes" + fi %configure \ --disable-silent-rules \ - --${opt} \ + ${SHARED_OPT} \ --enable-adms \ --enable-xspice \ --enable-maintainer-mode \ @@ -286,7 +296,6 @@ do --enable-openmp \ --enable-predictor \ --enable-shared \ - --with-readline=yes \ --libdir=%{_libdir} \ %{nil} @@ -324,8 +333,10 @@ popd # ref: https://sourceforge.net/p/ngspice/support-requests/34/ # For codemodel files, install non-shared version # so, first, install ngshared version, then non-shared version -cp -a INST-NGSPICE-with-ngshared/* %{buildroot} -cp -a INST-NGSPICE-without-ngshared/* %{buildroot} +for opt in SHARED NOSHARED +do + cp -a INST-NGSPICE-${opt}/* %{buildroot} +done cp -a INST-TCLSPICE/* %{buildroot} %{__rm} -rf \ @@ -400,6 +411,10 @@ cd tests %{_includedir}/ngspice/ %changelog +* Fri Feb 12 2021 Mamoru TASAKA - 34-2 +- build --with-ngshared with --with-readline=no to aviod missing + symbol for history_file, requested by the upstream + * Tue Feb 2 2021 Mamoru TASAKA - 34-1 - Update to 34 - Don't enable --enable-oldapps From 69d21cbff1fc3de36a6493cfa804243f39b1594b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:07:55 +0000 Subject: [PATCH 026/132] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 299679b..0d3bf71 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: A mixed level/signal circuit simulator License: BSD @@ -411,6 +411,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 34-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Feb 12 2021 Mamoru TASAKA - 34-2 - build --with-ngshared with --with-readline=no to aviod missing symbol for history_file, requested by the upstream From 8f97fc4c826197e4781d1034b93629d6fba832ec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 4 Aug 2021 22:30:09 +0900 Subject: [PATCH 027/132] try latest git --- .gitignore | 1 + ngspice.spec | 27 ++++++++++++++++++++------- sources | 1 + 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5db286f..9523db2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-34.tar.gz /ngspice-34-manual.pdf /ngspice-adms-va.7z +/ngspice-20210803T1822.tar.gz diff --git a/ngspice.spec b/ngspice.spec index 0d3bf71..d7c4a0e 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 798d2b2db121b4c6514f977e30d0636edf3ca789 -%global gitdate 20201016 +%global gitcommit 5603c8cae7ff4990e7453edba5c7a3594d3c0a91 +%global gitdate 20210723 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20201017 -%global tarballtime 1145 +%global tarballdate 20210803 +%global tarballtime 1822 %endif %if 0%{?userelease} >= 1 @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -164,7 +164,20 @@ git checkout -b %{name}-%{version}-fedora %{gitcommit} %endif pushd src/spicelib/devices/adms +%if 0%{?userelease} >= 1 7za x %{SOURCE2} +%endif +%if 0%{?usegitbare} >= 1 +# Check if some adms va files exist +for f in \ + bsimbulk/admsva/bsimbulk.va \ + bsimcmg/admsva/bsimcmg.va \ + ekv/admsva/ekv.va \ + %{nil} +do + test -f $f || exit 1 +done +%endif popd %patch0 -p2 -b .link diff --git a/sources b/sources index 415ef6d..fc18a89 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (ngspice-34.tar.gz) = 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8 SHA512 (ngspice-34-manual.pdf) = b53f9161b793223015a307ba607add4e540ad22f252c2f6e3c6deedfc3fde173ec290bbc4939d4e419321cad6a68218f6a9c9b4c7620ee01da86eabfc22e5b7e SHA512 (ngspice-adms-va.7z) = 923eac7e9d46e65aacda05657600bebae257f88aa8ed6f8dac7a21fd921463ca370047f2db2a2b95e1f8f340759b2888f49a2213939ef1e54e345bd6e2981b20 +SHA512 (ngspice-20210803T1822.tar.gz) = 843feb8169f38c4dcfc29a5866090bf21c3217ec9ab9cda87e8142afdaf9bc5a8b005e056c9429cfdfda5ed70acb70b6c5acd1a806836706489017dac7e8daa9 From 3df08a9475049f8fe3e846c1cb70bb24bded1561 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 9 Aug 2021 12:46:03 +0900 Subject: [PATCH 028/132] Update tp 35 --- .gitignore | 2 ++ ngspice.spec | 13 ++++++++----- sources | 7 +++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9523db2..3518313 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-34-manual.pdf /ngspice-adms-va.7z /ngspice-20210803T1822.tar.gz +/ngspice-35.tar.gz +/ngspice-35-manual.pdf diff --git a/ngspice.spec b/ngspice.spec index d7c4a0e..f41e32d 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,20 +5,20 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global mainver 34 -%global docver 34 +%global mainver 35 +%global docver 35 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 2 +%global mainrel 1 %if 0%{?usegitbare} >= 1 %global gitcommit 5603c8cae7ff4990e7453edba5c7a3594d3c0a91 @@ -424,6 +424,9 @@ cd tests %{_includedir}/ngspice/ %changelog +* Mon Aug 9 2021 Mamoru TASAKA - 35-1 +- Update tp 35 + * Thu Jul 22 2021 Fedora Release Engineering - 34-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index fc18a89..fd14563 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (ngspice-34.tar.gz) = 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8 -SHA512 (ngspice-34-manual.pdf) = b53f9161b793223015a307ba607add4e540ad22f252c2f6e3c6deedfc3fde173ec290bbc4939d4e419321cad6a68218f6a9c9b4c7620ee01da86eabfc22e5b7e -SHA512 (ngspice-adms-va.7z) = 923eac7e9d46e65aacda05657600bebae257f88aa8ed6f8dac7a21fd921463ca370047f2db2a2b95e1f8f340759b2888f49a2213939ef1e54e345bd6e2981b20 -SHA512 (ngspice-20210803T1822.tar.gz) = 843feb8169f38c4dcfc29a5866090bf21c3217ec9ab9cda87e8142afdaf9bc5a8b005e056c9429cfdfda5ed70acb70b6c5acd1a806836706489017dac7e8daa9 +SHA512 (ngspice-35.tar.gz) = 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b +SHA512 (ngspice-35-manual.pdf) = df3239c4798746534d12a489d80056d45d9f3cda60336aaeb2dd541526340715a180780b0e2ced1857e9c5cbe716c4b3f0c496598f8a3e8aa36a8cd1b6a022c7 +SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 66637ce3b10c8f66f4be5b3957aedadfa4b35a22 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 31 Oct 2021 15:49:58 +0900 Subject: [PATCH 029/132] update to the latest git --- .gitignore | 1 + ngspice.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3518313..3fa6661 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-20210803T1822.tar.gz /ngspice-35.tar.gz /ngspice-35-manual.pdf +/ngspice-20211031T1423.tar.gz diff --git a/ngspice.spec b/ngspice.spec index f41e32d..3d789c9 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -18,15 +18,15 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 5603c8cae7ff4990e7453edba5c7a3594d3c0a91 -%global gitdate 20210723 +%global gitcommit 87b9df66816696c085007e5d7731bc457d6208ba +%global gitdate 20211030 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210803 -%global tarballtime 1822 +%global tarballdate 20211031 +%global tarballtime 1423 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index fd14563..ca79ea0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-35.tar.gz) = 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b SHA512 (ngspice-35-manual.pdf) = df3239c4798746534d12a489d80056d45d9f3cda60336aaeb2dd541526340715a180780b0e2ced1857e9c5cbe716c4b3f0c496598f8a3e8aa36a8cd1b6a022c7 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a +SHA512 (ngspice-20211031T1423.tar.gz) = 200c788ad1f5ada89501f27e0b6bc43b14b78b051b01ae8b581bccd592f90e536a18873d74ff518eaa28479b1a32bd6867d67a9bf28a8a3f13706588f8d6b7fd From a867526c6f12ee277fc645c96acad627bffd9fcd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Nov 2021 21:27:30 +0900 Subject: [PATCH 030/132] try to excute test --- ngspice.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 3d789c9..37234bf 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -394,8 +394,18 @@ chmod +x %{buildroot}%{_libdir}/tclspice/ngspice/*.cm %if 0%{?usegitbare} >= 1 cd %{name} %endif -cd tests -#make check + +pushd tests + +# See https://sourceforge.net/p/ngspice/bugs/544/ +rm -rf USERPROFILE +mkdir USERPROFILE +echo "set ngbehavior=mc" > USERPROFILE/spice.rc +export USERPROFILE=$(pwd)/USERPROFILE + +make check + +popd %files %{_bindir}/* From 70f0feb817849099c7b11b7dfaae6d0185413f08 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 26 Dec 2021 16:40:34 +0900 Subject: [PATCH 031/132] update to the latest git --- .gitignore | 1 + ngspice.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3fa6661..1c557a1 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-35.tar.gz /ngspice-35-manual.pdf /ngspice-20211031T1423.tar.gz +/ngspice-20211226T1634.tar.gz diff --git a/ngspice.spec b/ngspice.spec index 37234bf..8c1e1c3 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 87b9df66816696c085007e5d7731bc457d6208ba -%global gitdate 20211030 +%global gitcommit c7bc84943a775480f72e17bddf8cb3b965d5492e +%global gitdate 20211223 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20211031 -%global tarballtime 1423 +%global tarballdate 20211226 +%global tarballtime 1634 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index ca79ea0..aa7943e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (ngspice-35-manual.pdf) = df3239c4798746534d12a489d80056d45d9f3cda60336aaeb2dd541526340715a180780b0e2ced1857e9c5cbe716c4b3f0c496598f8a3e8aa36a8cd1b6a022c7 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-20211031T1423.tar.gz) = 200c788ad1f5ada89501f27e0b6bc43b14b78b051b01ae8b581bccd592f90e536a18873d74ff518eaa28479b1a32bd6867d67a9bf28a8a3f13706588f8d6b7fd +SHA512 (ngspice-20211226T1634.tar.gz) = 23764b62594d3f597ed64befab083531d1df4eebe80bec1900f783f70724545a68ac46d48e5933494c1b602b3fc895824fbb4056b93e17214aff8f11c7fd997b From 5c4cf9906d1cd2443023cb2f16531e2549d6f8bb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 31 Dec 2021 10:19:27 +0900 Subject: [PATCH 032/132] Update to 36 --- .gitignore | 2 ++ ngspice.spec | 17 ++++++++++------- sources | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 1c557a1..9158e81 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice-35-manual.pdf /ngspice-20211031T1423.tar.gz /ngspice-20211226T1634.tar.gz +/ngspice-36.tar.gz +/ngspice-36-manual.pdf diff --git a/ngspice.spec b/ngspice.spec index 8c1e1c3..f98eabd 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,20 +5,20 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global mainver 35 -%global docver 35 +%global mainver 36 +%global docver 36 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 2 +%global mainrel 1 %if 0%{?usegitbare} >= 1 %global gitcommit c7bc84943a775480f72e17bddf8cb3b965d5492e @@ -150,7 +150,7 @@ git init git config user.name "%{name} maintainer" git config user.email "%{name}-owner@fedoraproject.org" git add . -git commit -m "base" -a +git commit -m "base" -q -a %endif %if 0%{?usegitbare} >= 1 @@ -434,8 +434,11 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Dec 31 2021 Mamoru TASAKA - 36-1 +- Update to 36 + * Mon Aug 9 2021 Mamoru TASAKA - 35-1 -- Update tp 35 +- Update to 35 * Thu Jul 22 2021 Fedora Release Engineering - 34-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index aa7943e..c911bae 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-35-manual.pdf) = df3239c4798746534d12a489d80056d45d9f3cda60336aaeb2dd541526340715a180780b0e2ced1857e9c5cbe716c4b3f0c496598f8a3e8aa36a8cd1b6a022c7 +SHA512 (ngspice-36.tar.gz) = d862097f465e92986e8d6644374d43249eebee0fb6d79b1404dbb7c11d14a058dfedd4bdb61baf5aa1ffd1d2e71167440db73eb417d4b1249a0a7b83bd39efc3 +SHA512 (ngspice-36-manual.pdf) = bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-20211226T1634.tar.gz) = 23764b62594d3f597ed64befab083531d1df4eebe80bec1900f783f70724545a68ac46d48e5933494c1b602b3fc895824fbb4056b93e17214aff8f11c7fd997b From 7fe34f5cb4b3c496c773e6e318a5511ffb136794 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:12:32 +0000 Subject: [PATCH 033/132] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index f98eabd..94391c5 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: A mixed level/signal circuit simulator License: BSD @@ -434,6 +434,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 36-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Dec 31 2021 Mamoru TASAKA - 36-1 - Update to 36 From 97f740f05a9b515007eedb042af3bc816183133e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 16 Mar 2022 17:31:50 +0900 Subject: [PATCH 034/132] try pre-master --- .gitignore | 40 +------------------ ...=> ngspice-37-blt-linkage-workaround.patch | 8 ++-- ngspice.spec | 16 ++++---- sources | 2 +- 4 files changed, 15 insertions(+), 51 deletions(-) rename ngspice-26-blt-linkage-workaround.patch => ngspice-37-blt-linkage-workaround.patch (94%) diff --git a/.gitignore b/.gitignore index 9158e81..b1de22c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,3 @@ -ngspice-21.pdf -ngspice-rework-20.cvs20100719.tar.bz2 -/ngspice-rework-22.cvs20101113.tar.bz2 -/ngspice-23.tar.gz -/ngspice23-manual.pdf -/ngspice-26.tar.gz -/ngspice-26-manual.pdf -/ngspice-27.tar.gz -/ngspice-27-manual.pdf -/ngspice-28.tar.gz -/ngspice-28-manual.pdf -/ng_adms_va.tar.gz -/bz1429130-input.ps -/bz1429130-input.cir -/bz1429130-expected.ps -/ngspice-29.tar.gz -/ngspice-29-manual.pdf -/ngspice-30.tar.gz -/ngspice-30-manual.pdf -/ngspice-31.tar.gz -/ngspice-31-manual.pdf -/ngspice-20200505T2059.tar.gz -/ngspice-32-manual.pdf -/ngspice-20200506T0950.tar.gz -/ngspice-20201008T2226.tar.gz -/ngspice-20201011T2051.tar.gz -/ngspice-20201017T1145.tar.gz -/ngspice-33.tar.gz -/ngspice-33-manual.pdf -/ngspice-34.tar.gz -/ngspice-34-manual.pdf +/ngspice-*.tar.gz /ngspice-adms-va.7z -/ngspice-20210803T1822.tar.gz -/ngspice-35.tar.gz -/ngspice-35-manual.pdf -/ngspice-20211031T1423.tar.gz -/ngspice-20211226T1634.tar.gz -/ngspice-36.tar.gz -/ngspice-36-manual.pdf +/ngspice-*-manual.pdf diff --git a/ngspice-26-blt-linkage-workaround.patch b/ngspice-37-blt-linkage-workaround.patch similarity index 94% rename from ngspice-26-blt-linkage-workaround.patch rename to ngspice-37-blt-linkage-workaround.patch index fedf3e8..edb6972 100644 --- a/ngspice-26-blt-linkage-workaround.patch +++ b/ngspice-37-blt-linkage-workaround.patch @@ -28,8 +28,8 @@ AM_CONDITIONAL([SHARED_MODULE], [test "x$has_shared_module" = xtrue]) AM_CONDITIONAL([SHWIN], [test "x$has_shwin" = xtrue]) ---- ngspice-26/tclspice/src/Makefile.am.link 2014-01-12 00:28:59.000000000 +0900 -+++ ngspice-26/tclspice/src/Makefile.am 2016-07-03 12:29:38.747329190 +0900 +--- ngspice-37/tclspice/src/Makefile.am.link 2014-01-12 00:28:59.000000000 +0900 ++++ ngspice-37/tclspice/src/Makefile.am 2016-07-03 12:29:38.747329190 +0900 @@ -331,6 +331,7 @@ if TCL_MODULE @@ -53,8 +53,8 @@ @X_LIBS@ \ frontend/libfte.la @@ -422,17 +427,27 @@ - misc/libmisc.la \ - $(LIBS) + maths/dense/libdense.la + endif +libspicelite_la_LIBADD = $(libspice_la_LIBADD) + diff --git a/ngspice.spec b/ngspice.spec index f98eabd..aed7aa5 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,12 +5,12 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force -%global userelease 1 +%global userelease 2 %endif %global mainver 36 @@ -21,12 +21,12 @@ %global mainrel 1 %if 0%{?usegitbare} >= 1 -%global gitcommit c7bc84943a775480f72e17bddf8cb3b965d5492e -%global gitdate 20211223 +%global gitcommit 9be02e7334b37b17bf774fb0978367171e0cc6c9 +%global gitdate 20220314 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20211226 -%global tarballtime 1634 +%global tarballdate 20220316 +%global tarballtime 1714 %endif %if 0%{?userelease} >= 1 @@ -60,7 +60,7 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) -Patch0: ngspice-26-blt-linkage-workaround.patch +Patch0: ngspice-37-blt-linkage-workaround.patch BuildRequires: make BuildRequires: gcc diff --git a/sources b/sources index c911bae..1b46cd4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-36.tar.gz) = d862097f465e92986e8d6644374d43249eebee0fb6d79b1404dbb7c11d14a058dfedd4bdb61baf5aa1ffd1d2e71167440db73eb417d4b1249a0a7b83bd39efc3 +SHA512 (ngspice-20220316T1714.tar.gz) = 2862d2dda07234614087e4564482a7c3d1cbe87a0e479e717d7f04db4658c0bf12fec4d1865a33d44e43072c3bc6ba3599f2bcfc770c537773dcdb63135c9d72 SHA512 (ngspice-36-manual.pdf) = bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 7c28469da8972714201f4efe598151b50353bf77 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 16 Mar 2022 17:35:25 +0900 Subject: [PATCH 035/132] bump release --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index aed7aa5..3451ff2 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -18,7 +18,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global mainrel 2 %if 0%{?usegitbare} >= 1 %global gitcommit 9be02e7334b37b17bf774fb0978367171e0cc6c9 From 1cc542e848446c05b30deae76143778d22f173e7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 16 Mar 2022 17:36:00 +0900 Subject: [PATCH 036/132] remove dot --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index b0c837f..236b215 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD From ac9f110cd761fd2c9e36458c63f405f8107f09a4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 22 Mar 2022 22:53:37 +0900 Subject: [PATCH 037/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 236b215..e8bb52d 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 9be02e7334b37b17bf774fb0978367171e0cc6c9 -%global gitdate 20220314 +%global gitcommit ae3d171d915dffebf8c22bc2e4cda8983cad8103 +%global gitdate 20220321 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20220316 -%global tarballtime 1714 +%global tarballdate 20220322 +%global tarballtime 2246 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 1b46cd4..6a47477 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20220316T1714.tar.gz) = 2862d2dda07234614087e4564482a7c3d1cbe87a0e479e717d7f04db4658c0bf12fec4d1865a33d44e43072c3bc6ba3599f2bcfc770c537773dcdb63135c9d72 SHA512 (ngspice-36-manual.pdf) = bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a +SHA512 (ngspice-20220322T2246.tar.gz) = 456477d61b74902911db0a5142fc45295c5ff24d54b99a738d16da023b44e1c3117601172014f1bde634b93beae433642eb7d1b3cfba8f5d4e020269bba08b24 From 7a995d63d344a39ef5f2f74bfda80024e4552d16 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Apr 2022 12:02:43 +0900 Subject: [PATCH 038/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index e8bb52d..b3a2951 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit ae3d171d915dffebf8c22bc2e4cda8983cad8103 -%global gitdate 20220321 +%global gitcommit 86132f445d76ef4364ef218df4285c3e7718d8ad +%global gitdate 20220328 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20220322 -%global tarballtime 2246 +%global tarballdate 20220403 +%global tarballtime 1155 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 6a47477..5fe210b 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (ngspice-36-manual.pdf) = bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 -SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-20220322T2246.tar.gz) = 456477d61b74902911db0a5142fc45295c5ff24d54b99a738d16da023b44e1c3117601172014f1bde634b93beae433642eb7d1b3cfba8f5d4e020269bba08b24 +SHA512 (ngspice-20220403T1155.tar.gz) = a82c0e19ee46c42223e366c5e9846dee0f6c46829887ac06e2b8722ee0e7244bfd682796e92518b5728e7aac9aec742f5c7ca45023971d30af81fe1de7c9c280 From 92b88b076bb517de1532900358b93bea4140736a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Apr 2022 12:07:42 +0900 Subject: [PATCH 039/132] reupload source --- sources | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources b/sources index 5fe210b..d8fbac5 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (ngspice-20220403T1155.tar.gz) = a82c0e19ee46c42223e366c5e9846dee0f6c46829887ac06e2b8722ee0e7244bfd682796e92518b5728e7aac9aec742f5c7ca45023971d30af81fe1de7c9c280 +SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a +SHA512 (ngspice-36-manual.pdf) = bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 From c5e356bbad31f8da1e22f7688749c328d2d57952 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 2 May 2022 18:24:05 +0900 Subject: [PATCH 040/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index b3a2951..6a23bcc 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 86132f445d76ef4364ef218df4285c3e7718d8ad -%global gitdate 20220328 +%global gitcommit cc285741f58bf6a9f37988199b09f49f7425144f +%global gitdate 20220430 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20220403 -%global tarballtime 1155 +%global tarballdate 20220502 +%global tarballtime 1812 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index d8fbac5..18ea13e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20220403T1155.tar.gz) = a82c0e19ee46c42223e366c5e9846dee0f6c46829887ac06e2b8722ee0e7244bfd682796e92518b5728e7aac9aec742f5c7ca45023971d30af81fe1de7c9c280 +SHA512 (ngspice-20220502T1812.tar.gz) = 29e606b8229549127a3a3d7d49453e883d4b996dd87495f3c4d51882f47a3fc0b7c16effab37fa66d442ec22f6cf24ec56a6dbb0f5a970f4f3cb4c01b3c25454 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-36-manual.pdf) = bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 From e8867e1ee0ae47cf07fb648d7bcbd21506ba16a8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 20 May 2022 14:41:41 +0900 Subject: [PATCH 041/132] Update to 37 --- ngspice.spec | 15 +++++++++------ sources | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 6a23bcc..27b238c 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,20 +5,20 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force -%global userelease 2 +%global userelease 1 %endif -%global mainver 36 -%global docver 36 +%global mainver 37 +%global docver 37 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 2 +%global mainrel 1 %if 0%{?usegitbare} >= 1 %global gitcommit cc285741f58bf6a9f37988199b09f49f7425144f @@ -434,6 +434,9 @@ popd %{_includedir}/ngspice/ %changelog +* Fri May 20 2022 Mamoru TASAKA - 37-1 +- Update to 37 + * Thu Jan 20 2022 Fedora Release Engineering - 36-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 18ea13e..493ab2e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20220502T1812.tar.gz) = 29e606b8229549127a3a3d7d49453e883d4b996dd87495f3c4d51882f47a3fc0b7c16effab37fa66d442ec22f6cf24ec56a6dbb0f5a970f4f3cb4c01b3c25454 +SHA512 (ngspice-37.tar.gz) = d49f7e78d3dd17ac8ea03d79dfbe8a9cf57c012395285cc0c0cf379e0c0c81f11cad68d5366dc2d2478959ed197e4d43380fbc15baf44f987f20ad00f1ee04ca SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-36-manual.pdf) = bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 +SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 From 18c71001c0d8ee600e9e2f0a8d38d5092ce35819 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Jun 2022 15:09:27 +0900 Subject: [PATCH 042/132] update to the latest git --- ngspice.spec | 14 +++++++------- sources | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 27b238c..d671d69 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -18,15 +18,15 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit cc285741f58bf6a9f37988199b09f49f7425144f -%global gitdate 20220430 +%global gitcommit 5e60ef4644928b0b3c3b59108dd829b9c64518ca +%global gitdate 20220622 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20220502 -%global tarballtime 1812 +%global tarballdate 20220624 +%global tarballtime 1459 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 493ab2e..a716f66 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-37.tar.gz) = d49f7e78d3dd17ac8ea03d79dfbe8a9cf57c012395285cc0c0cf379e0c0c81f11cad68d5366dc2d2478959ed197e4d43380fbc15baf44f987f20ad00f1ee04ca +SHA512 (ngspice-20220624T1459.tar.gz) = e57a61779e7a0ebddd9070eb3ec61b064577b67dbbdc42d074fc70bd22a8575d2a55efa75badaa3e82e17e3e2cd5e83da42330f4d2a7f193dbdf4508491db4ed SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 From c4a1a2e9705339b93928f78d5937d2305bc2d51b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 27 Jun 2022 16:35:20 +0900 Subject: [PATCH 043/132] update to the latest git --- ngspice.spec | 6 +++--- sources | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index d671d69..7aad918 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 5e60ef4644928b0b3c3b59108dd829b9c64518ca +%global gitcommit d02939580bf1608affe78d44642fc5a568db025b %global gitdate 20220622 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20220624 -%global tarballtime 1459 +%global tarballdate 20220627 +%global tarballtime 1623 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index a716f66..da9136d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20220624T1459.tar.gz) = e57a61779e7a0ebddd9070eb3ec61b064577b67dbbdc42d074fc70bd22a8575d2a55efa75badaa3e82e17e3e2cd5e83da42330f4d2a7f193dbdf4508491db4ed +SHA512 (ngspice-20220627T1623.tar.gz) = 254fa7ad7c1a6d86cd97e32d73090308671f107493e53df838d438a782b021c9e0acc51f779685f09dd91a5615d2f3a35d417d690b6f0ec87d735ed387b587ea SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 From b8448d070ab56c935da9c24add061e14632f80d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:34:30 +0000 Subject: [PATCH 044/132] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 27b238c..e19756a 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: A mixed level/signal circuit simulator License: BSD @@ -434,6 +434,9 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 37-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri May 20 2022 Mamoru TASAKA - 37-1 - Update to 37 From 37f0c6af21c3d235c8aa41e1706837d1c70502c2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Oct 2022 17:51:14 +0900 Subject: [PATCH 045/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 7aad918..2ba3f3d 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit d02939580bf1608affe78d44642fc5a568db025b -%global gitdate 20220622 +%global gitcommit 150839dd1ab51ffd91205b363b44aa648c503d4c +%global gitdate 20221008 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20220627 -%global tarballtime 1623 +%global tarballdate 20221009 +%global tarballtime 1746 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index da9136d..f9ec2e0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20220627T1623.tar.gz) = 254fa7ad7c1a6d86cd97e32d73090308671f107493e53df838d438a782b021c9e0acc51f779685f09dd91a5615d2f3a35d417d690b6f0ec87d735ed387b587ea +SHA512 (ngspice-20221009T1746.tar.gz) = 1a64646bceea3164152f0d1632eb97281aae5d195b6ea6f09da78e6540660af370f86b7543acfd1c8248e268a6e9604cf70de51c29df38dc383d02107bbf34b0 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 From 6207a7c1f6744e9e0517b30b385211595d3b3167 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Oct 2022 00:21:26 +0900 Subject: [PATCH 046/132] Fix error for -Werror=format-security --- ...compilation-error-with-Werror-format.patch | 28 +++++++++++++++++++ ngspice.spec | 3 ++ 2 files changed, 31 insertions(+) create mode 100644 0001-find_bridge-fix-compilation-error-with-Werror-format.patch diff --git a/0001-find_bridge-fix-compilation-error-with-Werror-format.patch b/0001-find_bridge-fix-compilation-error-with-Werror-format.patch new file mode 100644 index 0000000..e1b6a65 --- /dev/null +++ b/0001-find_bridge-fix-compilation-error-with-Werror-format.patch @@ -0,0 +1,28 @@ +From c1362cbd019e6ec32d85d0951ffcc60806148ceb Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Mon, 10 Oct 2022 00:18:59 +0900 +Subject: [PATCH] find_bridge: fix compilation error with + -Werror=format-security + +Fix the following error with gcc -Werror=format-security: +evtcheck_nodes.c:490:13: error: format not a string literal and no format arguments [-Werror=format-security] +--- + src/xspice/evt/evtcheck_nodes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xspice/evt/evtcheck_nodes.c b/src/xspice/evt/evtcheck_nodes.c +index fd56ad513..c82a044ba 100644 +--- a/src/xspice/evt/evtcheck_nodes.c ++++ b/src/xspice/evt/evtcheck_nodes.c +@@ -487,7 +487,7 @@ static struct bridge *find_bridge(Evt_Node_Info_t *event_node, + dot = strrchr(buff, '.'); + while (dot) { + if (!ok) { +- snprintf(dot + 1, sizeof buff - (size_t)(dot - buff), vcc_parm); ++ snprintf(dot + 1, sizeof buff - (size_t)(dot - buff), "%s", vcc_parm); + vcc = nupa_get_param(buff, &ok); + } + if (ok) +-- +2.37.3 + diff --git a/ngspice.spec b/ngspice.spec index 2ba3f3d..1d0ba57 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -61,6 +61,7 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch +Patch101: 0001-find_bridge-fix-compilation-error-with-Werror-format.patch BuildRequires: make BuildRequires: gcc @@ -183,6 +184,8 @@ popd %patch0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +cat %PATCH101 | git am + # make sure the examples are UTF-8... for nonUTF8 in \ examples/tclspice/tcl-testbench4/selectfromlist.tcl \ From 0bf6395086215f15869c2d628eda18204539b763 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 21 Oct 2022 11:17:52 +0900 Subject: [PATCH 047/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 1d0ba57..a542ecf 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 150839dd1ab51ffd91205b363b44aa648c503d4c -%global gitdate 20221008 +%global gitcommit 27ba1e39dfc92fae3f7fff190b773a6a6cf7cb30 +%global gitdate 20221017 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20221009 -%global tarballtime 1746 +%global tarballdate 20221021 +%global tarballtime 1111 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index f9ec2e0..50ac807 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20221009T1746.tar.gz) = 1a64646bceea3164152f0d1632eb97281aae5d195b6ea6f09da78e6540660af370f86b7543acfd1c8248e268a6e9604cf70de51c29df38dc383d02107bbf34b0 +SHA512 (ngspice-20221021T1111.tar.gz) = 5d4418aee8b8721348829161cf829088e66bedce629ec14fbef94edd8d21701d3cdad0f46967a4cf96fe3ffdf9b151afaec9ab08356cfdea99f206014c9fd146 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 From 27e95df5271900101b6d637b46370179cb5500a2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 23 Oct 2022 21:33:38 +0900 Subject: [PATCH 048/132] update to the latest git --- ...compilation-error-with-Werror-format.patch | 28 ------------------- create-ngspice-git-bare-tarball.sh | 2 +- ngspice.spec | 11 +++----- sources | 4 +-- 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 0001-find_bridge-fix-compilation-error-with-Werror-format.patch diff --git a/0001-find_bridge-fix-compilation-error-with-Werror-format.patch b/0001-find_bridge-fix-compilation-error-with-Werror-format.patch deleted file mode 100644 index e1b6a65..0000000 --- a/0001-find_bridge-fix-compilation-error-with-Werror-format.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c1362cbd019e6ec32d85d0951ffcc60806148ceb Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Mon, 10 Oct 2022 00:18:59 +0900 -Subject: [PATCH] find_bridge: fix compilation error with - -Werror=format-security - -Fix the following error with gcc -Werror=format-security: -evtcheck_nodes.c:490:13: error: format not a string literal and no format arguments [-Werror=format-security] ---- - src/xspice/evt/evtcheck_nodes.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xspice/evt/evtcheck_nodes.c b/src/xspice/evt/evtcheck_nodes.c -index fd56ad513..c82a044ba 100644 ---- a/src/xspice/evt/evtcheck_nodes.c -+++ b/src/xspice/evt/evtcheck_nodes.c -@@ -487,7 +487,7 @@ static struct bridge *find_bridge(Evt_Node_Info_t *event_node, - dot = strrchr(buff, '.'); - while (dot) { - if (!ok) { -- snprintf(dot + 1, sizeof buff - (size_t)(dot - buff), vcc_parm); -+ snprintf(dot + 1, sizeof buff - (size_t)(dot - buff), "%s", vcc_parm); - vcc = nupa_get_param(buff, &ok); - } - if (ok) --- -2.37.3 - diff --git a/create-ngspice-git-bare-tarball.sh b/create-ngspice-git-bare-tarball.sh index 93333e8..78953a6 100644 --- a/create-ngspice-git-bare-tarball.sh +++ b/create-ngspice-git-bare-tarball.sh @@ -18,7 +18,7 @@ pushd $TMPDIR git clone --mirror $GITURL cd ./${REPONAME}.git -git log | head -n 5 +git log --pretty=fuller | head -n 10 cd .. tar czf ${TARNAME} ${REPONAME}.git/ diff --git a/ngspice.spec b/ngspice.spec index a542ecf..8ff50cf 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 27ba1e39dfc92fae3f7fff190b773a6a6cf7cb30 -%global gitdate 20221017 +%global gitcommit 638a09b7184f2ff4e2fa373dc60d47f12a2078d0 +%global gitdate 20221022 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20221021 -%global tarballtime 1111 +%global tarballdate 20221023 +%global tarballtime 2120 %endif %if 0%{?userelease} >= 1 @@ -61,7 +61,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch -Patch101: 0001-find_bridge-fix-compilation-error-with-Werror-format.patch BuildRequires: make BuildRequires: gcc @@ -184,8 +183,6 @@ popd %patch0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -cat %PATCH101 | git am - # make sure the examples are UTF-8... for nonUTF8 in \ examples/tclspice/tcl-testbench4/selectfromlist.tcl \ diff --git a/sources b/sources index 50ac807..a69b884 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20221021T1111.tar.gz) = 5d4418aee8b8721348829161cf829088e66bedce629ec14fbef94edd8d21701d3cdad0f46967a4cf96fe3ffdf9b151afaec9ab08356cfdea99f206014c9fd146 -SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a +SHA512 (ngspice-20221023T2120.tar.gz) = 56a66e4b354c410d9ffd6713d5f958a19e796840a78479bbb311670aada8f5199c102d7a218a71285beea99248bc6817ad5d47aaef92c552fd60e2bd7a17ed49 SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 +SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From f398291adb53e5e8010d280293c6ed6fc3047344 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 24 Oct 2022 16:50:34 +0900 Subject: [PATCH 049/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 8ff50cf..0c54059 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 638a09b7184f2ff4e2fa373dc60d47f12a2078d0 -%global gitdate 20221022 +%global gitcommit 8cec3a62a17bd5b66593b0d1dc4d1ba53e534e20 +%global gitdate 20221023 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20221023 -%global tarballtime 2120 +%global tarballdate 20221024 +%global tarballtime 0829 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index a69b884..375c6a6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20221023T2120.tar.gz) = 56a66e4b354c410d9ffd6713d5f958a19e796840a78479bbb311670aada8f5199c102d7a218a71285beea99248bc6817ad5d47aaef92c552fd60e2bd7a17ed49 +SHA512 (ngspice-20221024T0829.tar.gz) = 496ee06c72e91a2710fad3d36dca56b826dd2e6af10db5abf927f8f7c56ff507fe2fbf701f980b9d592e40497257435c26fae44860aafefe9788beaa3b66526e SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From c8a565c7af36630be3e99338bc8956eee1906b75 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 26 Oct 2022 19:44:43 +0900 Subject: [PATCH 050/132] Split out codemodel files, and make ngspice, libngspice require codemodel Move scripts to %_libdir, they were arch-dependent actually --- ngspice.spec | 56 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index e19756a..4718a5d 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -18,7 +18,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global mainrel 2 %if 0%{?usegitbare} >= 1 %global gitcommit cc285741f58bf6a9f37988199b09f49f7425144f @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -91,6 +91,7 @@ BuildRequires: mot-adms BuildRequires: git +Requires: %{name}-codemodel%{?_isa} = %{version}-%{release} Obsoletes: ngspice-doc < 20-4.cvs20100619 Provides: ngspice-doc = %{version}-%{release} @@ -128,8 +129,15 @@ TclSpice is an improved version of Berkeley Spice designed to be used with the Tcl/Tk scripting language. The project is based upon the NG-Spice source code base with many improvements. +%package codemodel +Summary: ngspice codemodel and some script files + +%description codemodel +This package contains ngspice codemodel and some script files. + %package -n libngspice Summary: Shared library version of ngspice +Requires: %{name}-codemodel%{?_isa} = %{version}-%{release} %description -n libngspice This package contains shared library version of ngspice. @@ -204,6 +212,12 @@ find src/ -type f -name "*.l" -exec chmod -x {} ';' find src/ -type f -name "*.y" -exec chmod -x {} ';' git commit -m "Fix permission" -a || : +# Move spinit directory to arch-dependent +sed -i configure.ac -e '\@AC_DEFINE_UNQUOTED.*NGSPICEDATADIR@s|echo .dprefix/share/ngspice|echo %{_libdir}/ngspice|' +sed -i src/misc/ivars.c -e 's|/share/ngspice|/%_lib/ngspice|' +grep -rl "(pkgdatadir)/" . | xargs sed -i -e 's|(pkgdatadir)/|(pkglibdir)/|' +git commit -m "move spinit directory to arch-dependent" -a + # Fix Tclspice's examples sed -i \ 's|load "../../../src/.libs/libspice.so"|lappend auto_path "%{_libdir}/tclspice"\npackage require spice|' \ @@ -212,7 +226,7 @@ sed -i \ 's|load ../../../src/.libs/libspice.so|lappend auto_path "%{_libdir}/tclspice"\npackage require spice|' \ examples/tclspice/*/*.{tcl,sh} sed -i \ - 's|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice2poly|' \ + 's|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/ngspice/spice2poly|' \ examples/tclspice/tcl-testbench*/tcl-testbench*.sh git commit -m "Fix Tclspice's examples" -a @@ -243,9 +257,9 @@ export CFLAGS="%{optflags} -I%{_includedir}/blt" # Configure tclspice cd tclspice -sed -i \ - 's|\#define NGSPICEDATADIR "\`echo \$dprefix/share/ngspice\`"|\#define NGSPICEDATADIR "\`echo %{_libdir}/tclspice\`"|' \ - configure* +sed -i configure* \ + -e 's|\#define NGSPICEDATADIR "\`echo %{_libdir}/ngspice\`"|\#define NGSPICEDATADIR "\`echo %{_libdir}/tclspice/ngspice\`"|' +sed -i src/misc/ivars.c -e 's|/%_libdir/ngspice|/%_lib/tclspice/ngspice|' # direct access to Tcl_Interp->result deprecated in tcl8.6, # remaining usage cannot be replaced by Tcl_SetResult @@ -332,9 +346,9 @@ cd %{name} # Clean up unneeded / duplicate files also installed from ngspice pushd INST-TCLSPICE -rm -rf ./%{_datadir}/ngspice/include/ +rm -rf ./%{_libdir}/ngspice/include/ # see bug 1311869 -rm -f ./%{_datadir}/ngspice/scripts/spinit +rm -f ./%{_libdir}/tclspice/ngspice/scripts/spinit # binary differ # for --short-circuit if [ -f .%{_bindir}/cmpp ] ; then @@ -364,7 +378,7 @@ cp -a INST-TCLSPICE/* %{buildroot} # It seems that the below is not needed, compiled into binary already # (mtasaka, 20160628) %if 0 -cp -pr ./src/spicelib/devices/adms/ %{buildroot}%{_datadir}/%{name} +cp -pr ./src/spicelib/devices/adms/ %{buildroot}%{_libdir}/%{name} %endif # Ensuring that all docs are under %%{_pkgdocdir} @@ -409,21 +423,23 @@ popd %files %{_bindir}/* -%{_datadir}/%{name}/ -%exclude %{_datadir}/%{name}/scripts/tclspinit -%{_libdir}/ngspice/ - %{_mandir}/man1/* -%exclude %{_pkgdocdir}/examples/tclspice %doc %{_pkgdocdir} %license COPYING %files -n tclspice %doc %{_pkgdocdir}/examples/tclspice -%{_libdir}/tclspice/ -%dir %{_datadir}/ngspice -%dir %{_datadir}/%{name}/scripts/ -%{_datadir}/%{name}/scripts/tclspinit +%dir %{_libdir}/tclspice/ +%dir %{_libdir}/tclspice/%{name} +%{_libdir}/tclspice/libspice*.so* +%{_libdir}/tclspice/%{name}/*.cm +%{_libdir}/tclspice/%{name}/*.tcl +%{_libdir}/tclspice/%{name}/scripts/ + +%files codemodel +%dir %{_libdir}/%{name}/ +%{_libdir}/%{name}/*.cm +%{_libdir}/%{name}/scripts/ %files -n libngspice %{_libdir}/libngspice.so.0* @@ -434,6 +450,10 @@ popd %{_includedir}/ngspice/ %changelog +* Wed Oct 26 2022 Mamoru TASAKA - 37-2 +- Split out codemodel files, and make ngspice, libngspice require codemodel +- Move scripts to %%_libdir, they were arch-dependent actually + * Fri Jul 22 2022 Fedora Release Engineering - 37-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e5f5486675afb90f8e759dd573ab1adbbc52a476 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 26 Oct 2022 20:06:41 +0900 Subject: [PATCH 051/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index f15c728..fd3a0ef 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 2 %if 0%{?usegitbare} >= 1 -%global gitcommit 8cec3a62a17bd5b66593b0d1dc4d1ba53e534e20 -%global gitdate 20221023 +%global gitcommit b4f515bb05bafed3dfafc19b4ccdcad0a4cf59d1 +%global gitdate 20221025 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20221024 -%global tarballtime 0829 +%global tarballdate 20221026 +%global tarballtime 1537 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 375c6a6..452090b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20221024T0829.tar.gz) = 496ee06c72e91a2710fad3d36dca56b826dd2e6af10db5abf927f8f7c56ff507fe2fbf701f980b9d592e40497257435c26fae44860aafefe9788beaa3b66526e +SHA512 (ngspice-20221026T1537.tar.gz) = e18f558a11fe12ba6a40d6b6c0f23bea86eda6569c8189f41eff8746f88250190a8835ae13a8c0cb2b2ffd6b5dab157c648afbbae04239ffc65b6a0066c099eb SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 70a8115e9e7f22bd2f55b17b261fe157de5f1777 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 26 Oct 2022 20:06:58 +0900 Subject: [PATCH 052/132] bump release --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index fd3a0ef..16adda3 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -18,7 +18,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 2 +%global mainrel 3 %if 0%{?usegitbare} >= 1 %global gitcommit b4f515bb05bafed3dfafc19b4ccdcad0a4cf59d1 From da23ecb1e04a63942057055797174bb651c64f8a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 10:05:25 +0900 Subject: [PATCH 053/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 16adda3..8b4a6d2 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 3 %if 0%{?usegitbare} >= 1 -%global gitcommit b4f515bb05bafed3dfafc19b4ccdcad0a4cf59d1 -%global gitdate 20221025 +%global gitcommit 4b15632f9b21e71645a34ed984e893ec1fb9d9e8 +%global gitdate 20221026 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20221026 -%global tarballtime 1537 +%global tarballdate 20221027 +%global tarballtime 0927 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 452090b..43f8f1b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20221026T1537.tar.gz) = e18f558a11fe12ba6a40d6b6c0f23bea86eda6569c8189f41eff8746f88250190a8835ae13a8c0cb2b2ffd6b5dab157c648afbbae04239ffc65b6a0066c099eb +SHA512 (ngspice-20221027T0927.tar.gz) = 0b064e6f7a2965b888f89d551ebd3b26ccefa3c325826516c97d0140a8e77ab37bf3cd97315c5750f64b72bad87b0af4c1e040928cc36dd3002eeeae6443aeee SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 155e2bfc6c443ef16e8dd4f34ae82c560daa6be6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Oct 2022 13:12:48 +0900 Subject: [PATCH 054/132] fix example --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 4718a5d..90a48d8 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -226,7 +226,7 @@ sed -i \ 's|load ../../../src/.libs/libspice.so|lappend auto_path "%{_libdir}/tclspice"\npackage require spice|' \ examples/tclspice/*/*.{tcl,sh} sed -i \ - 's|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/ngspice/spice2poly|' \ + 's|spice::codemodel [\./][\./]*src/xspice/icm/spice2poly/|spice::codemodel %{_libdir}/tclspice/ngspice/|' \ examples/tclspice/tcl-testbench*/tcl-testbench*.sh git commit -m "Fix Tclspice's examples" -a From d5b7fd759d9976ead5eb0237ee7ed0d6107d5896 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 30 Oct 2022 00:05:59 +0900 Subject: [PATCH 055/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 386f827..3c93b22 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %global mainrel 3 %if 0%{?usegitbare} >= 1 -%global gitcommit 4b15632f9b21e71645a34ed984e893ec1fb9d9e8 -%global gitdate 20221026 +%global gitcommit c8ac00e87a524b756f0548cfbb249bcf79c5ec79 +%global gitdate 20221028 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20221027 -%global tarballtime 0927 +%global tarballdate 20221029 +%global tarballtime 2236 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 43f8f1b..757b7fe 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20221027T0927.tar.gz) = 0b064e6f7a2965b888f89d551ebd3b26ccefa3c325826516c97d0140a8e77ab37bf3cd97315c5750f64b72bad87b0af4c1e040928cc36dd3002eeeae6443aeee -SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 +SHA512 (ngspice-20221029T2236.tar.gz) = 3fead79d09d62d2bb0cf05f884e0459042e9f065708351955e1f7fe67af1bfb3100c7b8fd3bc1da2092d34fa76a728e9f0c6c1b88e9c005c9bf3515546a3db32 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a +SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 From f98b43fabca639a7fe82718eb79467720ad14d5b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 30 Oct 2022 00:12:10 +0900 Subject: [PATCH 056/132] Update to 38 --- ngspice.spec | 13 ++++++++----- sources | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 3c93b22..dfc2f5d 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,20 +5,20 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global mainver 37 -%global docver 37 +%global mainver 38 +%global docver 38 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 3 +%global mainrel 1 %if 0%{?usegitbare} >= 1 %global gitcommit c8ac00e87a524b756f0548cfbb249bcf79c5ec79 @@ -450,6 +450,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sat Oct 29 2022 Mamoru TASAKA - 38-1 +- Update to 38 + * Wed Oct 26 2022 Mamoru TASAKA - 37-2 - Split out codemodel files, and make ngspice, libngspice require codemodel - Move scripts to %%_libdir, they were arch-dependent actually diff --git a/sources b/sources index 757b7fe..9823660 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20221029T2236.tar.gz) = 3fead79d09d62d2bb0cf05f884e0459042e9f065708351955e1f7fe67af1bfb3100c7b8fd3bc1da2092d34fa76a728e9f0c6c1b88e9c005c9bf3515546a3db32 +SHA512 (ngspice-38.tar.gz) = 66490b251671eceda8ea0a7e216a08d90c7afa3828972d32fb1f6dbeb3223dc2e57584b1fc7f4c9e51fe385019b29b0942a30c1d87e90b004d7d932515ea9c3b +SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-37-manual.pdf) = 24ffc0816d4dd5fe76f3e26a13b7b31ce2384d06a680ce7109293a32ddcf377d72990a08c21f295988090bffc3a8590adc022885a9b7f5a7887cc1c8da732d96 From e1a02e16ae6adf677889b337194db923b4987c63 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 31 Dec 2022 21:59:25 +0900 Subject: [PATCH 057/132] update to the latest git --- ngspice.spec | 14 +++++++------- sources | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index dfc2f5d..ee58da9 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -18,15 +18,15 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global mainrel 1.1 %if 0%{?usegitbare} >= 1 -%global gitcommit c8ac00e87a524b756f0548cfbb249bcf79c5ec79 -%global gitdate 20221028 +%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13 +%global gitdate 20221227 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20221029 -%global tarballtime 2236 +%global tarballdate 20221231 +%global tarballtime 2138 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 9823660..3cb6951 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-38.tar.gz) = 66490b251671eceda8ea0a7e216a08d90c7afa3828972d32fb1f6dbeb3223dc2e57584b1fc7f4c9e51fe385019b29b0942a30c1d87e90b004d7d932515ea9c3b +SHA512 (ngspice-20221231T2138.tar.gz) = 49f49c0b5ab47b83ec87fa503f3c3613bb45cc185ad6b033ea41e8eb9a906c8329553228a2dabccc351a6984f661eb9be2de84cd4953dafb906f96ad9cc17f0a SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 6a0854517f2169c2f4524174e7d20bc89838da58 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 1 Jan 2023 21:52:33 +0900 Subject: [PATCH 058/132] enable osdi --- ngspice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngspice.spec b/ngspice.spec index ee58da9..65e41d2 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -275,6 +275,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --disable-silent-rules \ --enable-adms \ --enable-xspice \ + --enable-osdi \ --enable-maintainer-mode \ --enable-dependency-tracking \ --enable-cider \ @@ -313,6 +314,7 @@ do ${SHARED_OPT} \ --enable-adms \ --enable-xspice \ + --enable-osdi \ --enable-maintainer-mode \ --enable-dependency-tracking \ --enable-cider \ From 827fc3c8eef4c6b01cddf97ce2d1d379601e4773 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 3 Jan 2023 18:14:21 +0900 Subject: [PATCH 059/132] add patch for max_align_t usage --- ...-osdi-fix-wrong-usage-of-max_align_t.patch | 30 +++++++++++++++++++ ngspice.spec | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-osdi-fix-wrong-usage-of-max_align_t.patch diff --git a/0001-osdi-fix-wrong-usage-of-max_align_t.patch b/0001-osdi-fix-wrong-usage-of-max_align_t.patch new file mode 100644 index 0000000..e8dc194 --- /dev/null +++ b/0001-osdi-fix-wrong-usage-of-max_align_t.patch @@ -0,0 +1,30 @@ +From 410ffa0ec495ff7b7eeac65f7dcb2a5e9e5d4626 Mon Sep 17 00:00:00 2001 +From: ngspice maintainer +Date: Tue, 3 Jan 2023 18:13:07 +0900 +Subject: [PATCH] osdi: fix wrong usage of max_align_t + +max_align_t is used to examine the largest alignment requirement, +and it is expected to check the alignment value via alignof, not sizeof. + +Otherwise, __attribute__((aligned)) can complain as required alignment +being invalid, e.g. on s390x. +--- + src/osdi/osdidefs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/osdi/osdidefs.h b/src/osdi/osdidefs.h +index 45d117336..ee57f3a18 100644 +--- a/src/osdi/osdidefs.h ++++ b/src/osdi/osdidefs.h +@@ -44,7 +44,7 @@ typedef struct { + #ifdef _MSC_VER + #define MAX_ALIGN 8 + #else +-#define MAX_ALIGN sizeof(max_align_t) ++#define MAX_ALIGN alignof(max_align_t) + #endif + + +-- +2.39.0 + diff --git a/ngspice.spec b/ngspice.spec index 65e41d2..c6ad3af 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -18,7 +18,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1.1 +%global mainrel 1.2 %if 0%{?usegitbare} >= 1 %global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13 @@ -61,6 +61,7 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch +Patch10: 0001-osdi-fix-wrong-usage-of-max_align_t.patch BuildRequires: make BuildRequires: gcc @@ -190,6 +191,7 @@ popd %patch0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +cat %PATCH10 | git am # make sure the examples are UTF-8... for nonUTF8 in \ From a69a5104311996ef5f8e0237a5158da6e431c9de Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 3 Jan 2023 18:37:06 +0900 Subject: [PATCH 060/132] fix patch --- ...-osdi-fix-wrong-usage-of-max_align_t.patch | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/0001-osdi-fix-wrong-usage-of-max_align_t.patch b/0001-osdi-fix-wrong-usage-of-max_align_t.patch index e8dc194..9588390 100644 --- a/0001-osdi-fix-wrong-usage-of-max_align_t.patch +++ b/0001-osdi-fix-wrong-usage-of-max_align_t.patch @@ -1,6 +1,6 @@ -From 410ffa0ec495ff7b7eeac65f7dcb2a5e9e5d4626 Mon Sep 17 00:00:00 2001 +From 24abf9df6f2f817823fa4fd8bffd21d2a1a38b8a Mon Sep 17 00:00:00 2001 From: ngspice maintainer -Date: Tue, 3 Jan 2023 18:13:07 +0900 +Date: Tue, 3 Jan 2023 18:36:44 +0900 Subject: [PATCH] osdi: fix wrong usage of max_align_t max_align_t is used to examine the largest alignment requirement, @@ -9,14 +9,22 @@ and it is expected to check the alignment value via alignof, not sizeof. Otherwise, __attribute__((aligned)) can complain as required alignment being invalid, e.g. on s390x. --- - src/osdi/osdidefs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/osdi/osdidefs.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osdi/osdidefs.h b/src/osdi/osdidefs.h -index 45d117336..ee57f3a18 100644 +index 45d117336..3deabbd22 100644 --- a/src/osdi/osdidefs.h +++ b/src/osdi/osdidefs.h -@@ -44,7 +44,7 @@ typedef struct { +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + #ifdef _MSC_VER + typedef struct { +@@ -44,7 +45,7 @@ typedef struct { #ifdef _MSC_VER #define MAX_ALIGN 8 #else From 33f94059fcb6c6f6bf57bc48c71fd14484d3770e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:35:30 +0000 Subject: [PATCH 061/132] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index dfc2f5d..208f8cc 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{mainver} -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: A mixed level/signal circuit simulator License: BSD @@ -450,6 +450,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 38-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Oct 29 2022 Mamoru TASAKA - 38-1 - Update to 38 From 1a4538ea935eb250c005caea9851c4e4a558a741 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 31 Jan 2023 23:27:01 +0900 Subject: [PATCH 062/132] update to ngspice 39 --- ngspice.spec | 15 +++++++++------ sources | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index c6ad3af..de0fcaf 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,20 +5,20 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global mainver 38 -%global docver 38 +%global mainver 39 +%global docver 39 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1.2 +%global mainrel 0.1 %if 0%{?usegitbare} >= 1 %global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13 @@ -191,7 +191,7 @@ popd %patch0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -cat %PATCH10 | git am +#cat %%PATCH10 | git am # make sure the examples are UTF-8... for nonUTF8 in \ @@ -454,6 +454,9 @@ popd %{_includedir}/ngspice/ %changelog +* Wed Feb 1 2023 Mamoru TASAKA - 39-1 +- Update to 39 + * Sat Oct 29 2022 Mamoru TASAKA - 38-1 - Update to 38 diff --git a/sources b/sources index 3cb6951..3649a31 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20221231T2138.tar.gz) = 49f49c0b5ab47b83ec87fa503f3c3613bb45cc185ad6b033ea41e8eb9a906c8329553228a2dabccc351a6984f661eb9be2de84cd4953dafb906f96ad9cc17f0a -SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507 +SHA512 (ngspice-39.tar.gz) = e09f20fc410fee987dc2108d9f10a536eb1a4f576a6c0d3c9e3c58fcf733213a1c71711185bb2f84a02301f65cb993e319478c2509b5e61d29f6c42ffbf40309 +SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 3ce540f11be2a3585331a6ecf77666d320f59fed Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Feb 2023 11:03:43 +0900 Subject: [PATCH 063/132] patch10 is actually needed --- ngspice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index de0fcaf..4bc8c04 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -18,7 +18,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 0.1 +%global mainrel 1 %if 0%{?usegitbare} >= 1 %global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13 @@ -191,7 +191,7 @@ popd %patch0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -#cat %%PATCH10 | git am +cat %PATCH10 | git am # make sure the examples are UTF-8... for nonUTF8 in \ From fbbbcda9819cd622c5b97069b500d9775d9a1910 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Feb 2023 22:35:05 +0900 Subject: [PATCH 064/132] Update to 39.2 --- ...-osdi-fix-wrong-usage-of-max_align_t.patch | 38 ------------------- ngspice.spec | 21 +++++----- sources | 2 +- 3 files changed, 13 insertions(+), 48 deletions(-) delete mode 100644 0001-osdi-fix-wrong-usage-of-max_align_t.patch diff --git a/0001-osdi-fix-wrong-usage-of-max_align_t.patch b/0001-osdi-fix-wrong-usage-of-max_align_t.patch deleted file mode 100644 index 9588390..0000000 --- a/0001-osdi-fix-wrong-usage-of-max_align_t.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 24abf9df6f2f817823fa4fd8bffd21d2a1a38b8a Mon Sep 17 00:00:00 2001 -From: ngspice maintainer -Date: Tue, 3 Jan 2023 18:36:44 +0900 -Subject: [PATCH] osdi: fix wrong usage of max_align_t - -max_align_t is used to examine the largest alignment requirement, -and it is expected to check the alignment value via alignof, not sizeof. - -Otherwise, __attribute__((aligned)) can complain as required alignment -being invalid, e.g. on s390x. ---- - src/osdi/osdidefs.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/osdi/osdidefs.h b/src/osdi/osdidefs.h -index 45d117336..3deabbd22 100644 ---- a/src/osdi/osdidefs.h -+++ b/src/osdi/osdidefs.h -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #ifdef _MSC_VER - typedef struct { -@@ -44,7 +45,7 @@ typedef struct { - #ifdef _MSC_VER - #define MAX_ALIGN 8 - #else --#define MAX_ALIGN sizeof(max_align_t) -+#define MAX_ALIGN alignof(max_align_t) - #endif - - --- -2.39.0 - diff --git a/ngspice.spec b/ngspice.spec index b9caa71..256da50 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -13,8 +13,9 @@ %global userelease 1 %endif -%global mainver 39 -%global docver 39 +%global majorver 39 +%global minorver 2 +%global docver 39 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -40,21 +41,21 @@ %undefine _changelog_trimtime Name: ngspice -Version: %{mainver} -Release: %{fedorarel}%{?dist}.1 +Version: %{majorver}%{?minorver:.%minorver} +Release: %{fedorarel}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD URL: http://ngspice.sourceforge.net %if 0%{?userelease} >= 1 -Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-%{version}.tar.gz +Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-%{majorver}.tar.gz %endif %if 0%{?usegitbare} >= 1 Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz %endif -Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-%{docver}-manual.pdf -Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{version}/ngspice-adms-va.7z +Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-%{docver}-manual.pdf +Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-adms-va.7z Source10: create-ngspice-git-bare-tarball.sh @@ -154,7 +155,7 @@ developing applications that use libngspice. %prep %if 0%{?userelease} >= 1 -%setup -q +%setup -q -n %{name}-%{majorver} git init git config user.name "%{name} maintainer" git config user.email "%{name}-owner@fedoraproject.org" @@ -191,7 +192,6 @@ popd %patch0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -cat %PATCH10 | git am # make sure the examples are UTF-8... for nonUTF8 in \ @@ -454,6 +454,9 @@ popd %{_includedir}/ngspice/ %changelog +* Wed Feb 1 2023 Mamoru TASAKA - 39.2-1 +- Update to 39.2 + * Wed Feb 1 2023 Mamoru TASAKA - 39-1 - Update to 39 diff --git a/sources b/sources index 3649a31..3f15b6c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-39.tar.gz) = e09f20fc410fee987dc2108d9f10a536eb1a4f576a6c0d3c9e3c58fcf733213a1c71711185bb2f84a02301f65cb993e319478c2509b5e61d29f6c42ffbf40309 +SHA512 (ngspice-39.tar.gz) = aa38b3e77b157b677efa8976d61e96839e8f87963ed558e62691eb227c72341eda5290fdf106493918e5fdd3b41c5dfd9e5ce8ae38879848b8eb654fca953df2 SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 43e7b221efdd588d5ce1a4c645d3afe2ef7259c2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Feb 2023 22:39:56 +0900 Subject: [PATCH 065/132] remove unneeded patch from entry --- ngspice.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 256da50..1718b77 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -62,7 +62,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch -Patch10: 0001-osdi-fix-wrong-usage-of-max_align_t.patch BuildRequires: make BuildRequires: gcc From a455275f3f1c23275963d7f6655e0391e4f261ec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 3 Feb 2023 22:50:29 +0900 Subject: [PATCH 066/132] Update to 39.3 --- ngspice.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 1718b77..5f8d6b9 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -14,7 +14,7 @@ %endif %global majorver 39 -%global minorver 2 +%global minorver 3 %global docver 39 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -453,6 +453,9 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Feb 3 2023 Mamoru TASAKA - 39.3-1 +- Update to 39.3 + * Wed Feb 1 2023 Mamoru TASAKA - 39.2-1 - Update to 39.2 diff --git a/sources b/sources index 3f15b6c..8f591cb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-39.tar.gz) = aa38b3e77b157b677efa8976d61e96839e8f87963ed558e62691eb227c72341eda5290fdf106493918e5fdd3b41c5dfd9e5ce8ae38879848b8eb654fca953df2 +SHA512 (ngspice-39.tar.gz) = 724415cea3249d049d796360f5f59ec5e68edb1899e82b0fbd68455791863c274abe1a505b7148ef96adbb485bc677d38432fa4effe4069bbdfe284ff3e59921 SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 6b4ed36c401d98e2844c98638dbc1c5c5fee7edd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:19:27 +0900 Subject: [PATCH 067/132] rename release macro to make rpmdev-bumprelease work --- ngspice.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 5f8d6b9..b5ca017 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -31,18 +31,18 @@ %endif %if 0%{?userelease} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?usegitbare} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} -#%%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} +#%%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %undefine _changelog_trimtime Name: ngspice Version: %{majorver}%{?minorver:.%minorver} -Release: %{fedorarel}%{?dist} +Release: %{baserelease}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD From c8dd67a7e15881351e646c8372008e204d60a487 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 15:23:23 +0900 Subject: [PATCH 068/132] correct baserelease usage --- ngspice.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index b5ca017..bae3ab5 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrel 1 +%global baserelease 1 %if 0%{?usegitbare} >= 1 %global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13 @@ -31,18 +31,18 @@ %endif %if 0%{?userelease} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %if 0%{?usegitbare} >= 1 -%global baserelease %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} -#%%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}.D%{gitdate}git%{shortcommit} +#%%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %undefine _changelog_trimtime Name: ngspice Version: %{majorver}%{?minorver:.%minorver} -Release: %{baserelease}%{?dist} +Release: %{fedorarel}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD From e9dd0e23183b153c2bab87bda4a3fe275b415b97 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 15:43:07 +0900 Subject: [PATCH 069/132] update to the latest git --- ngspice.spec | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index bae3ab5..5a01c63 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -22,27 +22,26 @@ %global baserelease 1 %if 0%{?usegitbare} >= 1 -%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13 -%global gitdate 20221227 +%global gitcommit 86951501a7ffffcd43454659d09f8a81055b7096 +%global gitdate 20230319 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20221231 -%global tarballtime 2138 +%global tarballdate 20230324 +%global tarballtime 1531 %endif -%if 0%{?userelease} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} +%if 0%{?userelease} >= 1 +%global fedoraver %{majorver}%{?minorver:.%minorver} %endif -%if 0%{?usegitbare} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}.D%{gitdate}git%{shortcommit} -#%%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} +%if 0%{?usegitbare} >= 1 +%global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif %undefine _changelog_trimtime Name: ngspice -Version: %{majorver}%{?minorver:.%minorver} -Release: %{fedorarel}%{?dist} +Version: %{fedoraver} +Release: 0.1%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -157,7 +156,7 @@ developing applications that use libngspice. %setup -q -n %{name}-%{majorver} git init git config user.name "%{name} maintainer" -git config user.email "%{name}-owner@fedoraproject.org" +git config user.email "%{name}-maintainers@fedoraproject.org" git add . git commit -m "base" -q -a %endif @@ -167,9 +166,9 @@ git commit -m "base" -q -a git clone ./%{name}.git/ cd %{name} git config user.name "%{name} maintainer" -git config user.email "%{name}-owner@fedoraproject.org" +git config user.email "%{name}-maintainers@fedoraproject.org" -git checkout -b %{name}-%{version}-fedora %{gitcommit} +git checkout -b %{name}-%{majorver}-fedora %{gitcommit} %endif pushd src/spicelib/devices/adms From d8a66d0aa9f4ef41243a46b7ce28e4538aaed79c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 15:44:08 +0900 Subject: [PATCH 070/132] fix release --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index 5a01c63..bd892e5 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -41,7 +41,7 @@ Name: ngspice Version: %{fedoraver} -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: A mixed level/signal circuit simulator License: BSD From 453fd37f82c18aa533bcd0f7e4b916dfc74e05c8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:00:42 +0900 Subject: [PATCH 071/132] update to the latest git --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 8f591cb..df769d4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-39.tar.gz) = 724415cea3249d049d796360f5f59ec5e68edb1899e82b0fbd68455791863c274abe1a505b7148ef96adbb485bc677d38432fa4effe4069bbdfe284ff3e59921 +SHA512 (ngspice-20230324T1531.tar.gz) = 6f9a2da72307849691b865bc3baf91ac8ec4480c1ee5d51e83219c6d87ada5672c50dbbcb28104a2359da2cbee7816116b5e976287b9a83988671640f6b679c8 SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 5169f556daa48ed726c05df6f14b42f16201469f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 1 Apr 2023 22:36:13 +0900 Subject: [PATCH 072/132] Update to 40 --- ngspice.spec | 19 ++++++++++--------- sources | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index bd892e5..df76871 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,22 +5,20 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global majorver 39 -%global minorver 3 -%global docver 39 +%global majorver 40 +#%%global minorver 3 +%global docver 40 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 1 - %if 0%{?usegitbare} >= 1 %global gitcommit 86951501a7ffffcd43454659d09f8a81055b7096 %global gitdate 20230319 @@ -162,7 +160,7 @@ git commit -m "base" -q -a %endif %if 0%{?usegitbare} >= 1 -%setup -q -c -T -a 0 +%setup -q -c -n %{name}-%{majorver}%{?minorver:.%minorver}-%{gitdate}git%{shortcommit} -T -a 0 git clone ./%{name}.git/ cd %{name} git config user.name "%{name} maintainer" @@ -188,7 +186,7 @@ done %endif popd -%patch0 -p2 -b .link +%patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a # make sure the examples are UTF-8... @@ -452,6 +450,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sat Apr 1 2023 Mamoru TASAKA - 40-1 +- Update to 40 + * Fri Feb 3 2023 Mamoru TASAKA - 39.3-1 - Update to 39.3 diff --git a/sources b/sources index df769d4..81aa341 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230324T1531.tar.gz) = 6f9a2da72307849691b865bc3baf91ac8ec4480c1ee5d51e83219c6d87ada5672c50dbbcb28104a2359da2cbee7816116b5e976287b9a83988671640f6b679c8 -SHA512 (ngspice-39-manual.pdf) = 3e7b9dc8bebb0affd0fa30cfbd31776bfd564a472ccd2f8e09fb265b37d34e4be95a6dd41ea2ff565c973bb30b2fa5115ff6c894e84c290193faf3e4b772c95a +SHA512 (ngspice-40.tar.gz) = dab422cc8677e6f4bb92e06be0ce695a53d3e9abbe533c7bb91540d55d2a13514b0b166c8ccafcc17699799a846a35e260dddc400664c6e1137e1b18504e9954 +SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From e6c22773461dc7c120672035eed15eb2057dd3dc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 21 Apr 2023 12:48:17 +0900 Subject: [PATCH 073/132] update to the latest git --- ngspice.spec | 12 ++++++------ sources | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index df76871..c18d136 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -20,12 +20,12 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -%global gitcommit 86951501a7ffffcd43454659d09f8a81055b7096 -%global gitdate 20230319 +%global gitcommit f5279c0ef5507833cf69d2555a67015ffc175885 +%global gitdate 20230418 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230324 -%global tarballtime 1531 +%global tarballdate 20230421 +%global tarballtime 1237 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 81aa341..509014d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-40.tar.gz) = dab422cc8677e6f4bb92e06be0ce695a53d3e9abbe533c7bb91540d55d2a13514b0b166c8ccafcc17699799a846a35e260dddc400664c6e1137e1b18504e9954 +SHA512 (ngspice-20230421T1237.tar.gz) = 9f00f92ddd7913ac6cd142abb167f21ae44b651af75e8fccff7e55ebca39b5490570c27215ad0ac024bd4b69a7c923475abc4a632e37af0df9b22a39ecafc97a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 5eec85c32bd1a47cd5f9d863d7fb170064e978e6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2023 12:14:32 +0900 Subject: [PATCH 074/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index c18d136..765ff49 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -20,12 +20,12 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -%global gitcommit f5279c0ef5507833cf69d2555a67015ffc175885 -%global gitdate 20230418 +%global gitcommit d4d576d69599b6857162fc1a770f441a8b3f7ff1 +%global gitdate 20230502 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230421 -%global tarballtime 1237 +%global tarballdate 20230506 +%global tarballtime 1204 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 509014d..2a8b0bd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230421T1237.tar.gz) = 9f00f92ddd7913ac6cd142abb167f21ae44b651af75e8fccff7e55ebca39b5490570c27215ad0ac024bd4b69a7c923475abc4a632e37af0df9b22a39ecafc97a +SHA512 (ngspice-20230506T1204.tar.gz) = 081d8fdb70ba54884ec906851d68c385339d2734ddc53ecdcd5129e195bace9e004a63a36ced996733c2f78886e27814bae93dc8f1e81878b8eaf5f19f368e43 SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From e34cc59b441949d0c59018b074197a42863c1675 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 30 May 2023 15:13:44 +0900 Subject: [PATCH 075/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 765ff49..a250694 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -20,12 +20,12 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -%global gitcommit d4d576d69599b6857162fc1a770f441a8b3f7ff1 -%global gitdate 20230502 +%global gitcommit fd24e5af7e3cbc7ffed487b98739f5f94d63481d +%global gitdate 20230530 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230506 -%global tarballtime 1204 +%global tarballdate 20230530 +%global tarballtime 1504 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 2a8b0bd..38a82c2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230506T1204.tar.gz) = 081d8fdb70ba54884ec906851d68c385339d2734ddc53ecdcd5129e195bace9e004a63a36ced996733c2f78886e27814bae93dc8f1e81878b8eaf5f19f368e43 +SHA512 (ngspice-20230530T1504.tar.gz) = 6bcdcd810d4003af5e686289fd37ac8fb48d4bcfb9eafaf74347643455bb28f07bbdd74b7d54b07382ef8a4c942898419a5b90a3cd293132ef15ae33fb9194bc SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 4936fea661bab54bbdad6cfb76bf0afe8466d5b1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Jun 2023 21:16:15 +0900 Subject: [PATCH 076/132] fix date --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index a250694..f90b55d 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,7 +21,7 @@ %if 0%{?usegitbare} >= 1 %global gitcommit fd24e5af7e3cbc7ffed487b98739f5f94d63481d -%global gitdate 20230530 +%global gitdate 20230527 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) %global tarballdate 20230530 From 1adf4ea738a64c4a8627993e4cd4672eaa5486eb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 7 Jul 2023 15:14:24 +0900 Subject: [PATCH 077/132] Update to the latest git --- ngspice.spec | 9 +++++---- sources | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index f90b55d..97dc16f 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -20,12 +20,13 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -%global gitcommit fd24e5af7e3cbc7ffed487b98739f5f94d63481d -%global gitdate 20230527 +# pre-master +%global gitcommit c6edbe44dbf525a27c9da2fa08a75427d898df5a +%global gitdate 20230704 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230530 -%global tarballtime 1504 +%global tarballdate 20230707 +%global tarballtime 1506 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 38a82c2..39db365 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230530T1504.tar.gz) = 6bcdcd810d4003af5e686289fd37ac8fb48d4bcfb9eafaf74347643455bb28f07bbdd74b7d54b07382ef8a4c942898419a5b90a3cd293132ef15ae33fb9194bc +SHA512 (ngspice-20230707T1506.tar.gz) = 27cabe37983ec16b301992450623f15f69651ae34c1a234e132c62397d6eb3223b67f36e3adedb8db586a6d068ef1265b2f6173a26075da66a7ea22f82a114e8 SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From ae944641faeaa588484cb66da473309164a34a49 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 20 Jul 2023 15:06:47 +0900 Subject: [PATCH 078/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 97dc16f..ed9df1d 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # pre-master -%global gitcommit c6edbe44dbf525a27c9da2fa08a75427d898df5a -%global gitdate 20230704 +%global gitcommit 4d8b105b86ed2b390338b7c44d740a0eb2c1296c +%global gitdate 20230715 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230707 -%global tarballtime 1506 +%global tarballdate 20230720 +%global tarballtime 1415 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 39db365..49ba1c8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230707T1506.tar.gz) = 27cabe37983ec16b301992450623f15f69651ae34c1a234e132c62397d6eb3223b67f36e3adedb8db586a6d068ef1265b2f6173a26075da66a7ea22f82a114e8 +SHA512 (ngspice-20230720T1415.tar.gz) = e13fabae5193523e8c27a2ada4913b0996ea79357e531ef77fdc0207a44a7faf4af85f969692bd8c0930218e2b6618e8f55c4e3dad97799947116992cae51c92 SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a From 325dbf0809942b14dfbccb1e181abcbcc21ace01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:40:43 +0000 Subject: [PATCH 079/132] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index df76871..044e8fa 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -39,7 +39,7 @@ Name: ngspice Version: %{fedoraver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -450,6 +450,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 40-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Apr 1 2023 Mamoru TASAKA - 40-1 - Update to 40 From bc54b6a62208a3f6c4b5989b66b8e423478ae34f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 25 Jul 2023 14:13:18 +0900 Subject: [PATCH 080/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index ed9df1d..46f490c 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # pre-master -%global gitcommit 4d8b105b86ed2b390338b7c44d740a0eb2c1296c -%global gitdate 20230715 +%global gitcommit d1187e9a34896927531436f37d2663ca9c28b393 +%global gitdate 20230724 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230720 -%global tarballtime 1415 +%global tarballdate 20230725 +%global tarballtime 1405 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 49ba1c8..9328188 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230720T1415.tar.gz) = e13fabae5193523e8c27a2ada4913b0996ea79357e531ef77fdc0207a44a7faf4af85f969692bd8c0930218e2b6618e8f55c4e3dad97799947116992cae51c92 -SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 +SHA512 (ngspice-20230725T1405.tar.gz) = 1d8d49dae0886c055e32dcf69d7e5d21bfe0a557c261e75b9bb04a182e0733459a1af2f4dba034fe7dd19642e78b887ca3a5c534735f4b011055a6908421c71a SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a +SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From a4138e92a08c97a04b4dfdad9f7323375d36ea69 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 28 Jul 2023 11:33:30 +0900 Subject: [PATCH 081/132] update to the latest git --- ngspice.spec | 10 +++++----- sources | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 313431e..d613eb6 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # pre-master -%global gitcommit d1187e9a34896927531436f37d2663ca9c28b393 -%global gitdate 20230724 +%global gitcommit 8f3c83f77642182f5a74887856c3fa465603ba4f +%global gitdate 20230725 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230725 -%global tarballtime 1405 +%global tarballdate 20230728 +%global tarballtime 1112 %endif %if 0%{?userelease} >= 1 @@ -40,7 +40,7 @@ Name: ngspice Version: %{fedoraver} -Release: 2%{?dist} +Release: 1%{?dist} Summary: A mixed level/signal circuit simulator License: BSD diff --git a/sources b/sources index 9328188..f22bde2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230725T1405.tar.gz) = 1d8d49dae0886c055e32dcf69d7e5d21bfe0a557c261e75b9bb04a182e0733459a1af2f4dba034fe7dd19642e78b887ca3a5c534735f4b011055a6908421c71a +SHA512 (ngspice-20230728T1112.tar.gz) = 81da6e2dd2feab480da40ed06a56c6dccb4dd531730a4c82657e61acd44e188c2c8fbf1624f1acb53c8e119765a77478b9c8845bde45e9b373c0cdcb7a3a61cb SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From cdee3be242258f078755362ddd6307cea0ae1f19 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 31 Jul 2023 15:31:10 +0900 Subject: [PATCH 082/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index d613eb6..60ee59f 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # pre-master -%global gitcommit 8f3c83f77642182f5a74887856c3fa465603ba4f -%global gitdate 20230725 +%global gitcommit 4246b3112653a7f26f6d3bd1b89031178f8db7df +%global gitdate 20230730 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230728 -%global tarballtime 1112 +%global tarballdate 20230731 +%global tarballtime 1518 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index f22bde2..744efdf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230728T1112.tar.gz) = 81da6e2dd2feab480da40ed06a56c6dccb4dd531730a4c82657e61acd44e188c2c8fbf1624f1acb53c8e119765a77478b9c8845bde45e9b373c0cdcb7a3a61cb +SHA512 (ngspice-20230731T1518.tar.gz) = 5ce2cb3e00b9ecb6ae168a38da0683327b89e4ed90f13c87d8172270266009e9640756be74bdedf8bc2652ddf1daa35e0f0d6b3d83981ded0c23d23125644f35 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From ec6a22674f3cfeb8443920e4faf2a92ba9c99033 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 2 Aug 2023 22:44:25 +0900 Subject: [PATCH 083/132] update to the latest git --- ngspice.spec | 10 +++++----- sources | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 60ee59f..d68366e 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -20,13 +20,13 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -# pre-master -%global gitcommit 4246b3112653a7f26f6d3bd1b89031178f8db7df -%global gitdate 20230730 +# master +%global gitcommit 75ce3c95e333454e0709bb1651e28d0303ded911 +%global gitdate 20230731 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230731 -%global tarballtime 1518 +%global tarballdate 20230802 +%global tarballtime 2232 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 744efdf..1e75bdb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230731T1518.tar.gz) = 5ce2cb3e00b9ecb6ae168a38da0683327b89e4ed90f13c87d8172270266009e9640756be74bdedf8bc2652ddf1daa35e0f0d6b3d83981ded0c23d23125644f35 +SHA512 (ngspice-20230802T2232.tar.gz) = c04f82a2f5390ea3fbbbf897b330db6fa67981a52a0097efcf32668d65a70cba5783330ea5b47e05c45aa2c2c70b4128bba17dbe67798416dcdc058928958398 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From 9c6438b1ce381555a09073bcb568594162c3a397 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 3 Aug 2023 00:51:21 +0900 Subject: [PATCH 084/132] fix module path search dir --- ngspice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index d68366e..f043094 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -213,7 +213,8 @@ git commit -m "Fix permission" -a || : # Move spinit directory to arch-dependent sed -i configure.ac -e '\@AC_DEFINE_UNQUOTED.*NGSPICEDATADIR@s|echo .dprefix/share/ngspice|echo %{_libdir}/ngspice|' -sed -i src/misc/ivars.c -e 's|/share/ngspice|/%_lib/ngspice|' +sed -i src/misc/ivars.c -e 's|\(["/]\)share/ngspice|\1%_lib/ngspice|' +sed -i src/misc/ivars.c -e 's|\(["/]\)lib/ngspice|\1%_lib/ngspice|' grep -rl "(pkgdatadir)/" . | xargs sed -i -e 's|(pkgdatadir)/|(pkglibdir)/|' git commit -m "move spinit directory to arch-dependent" -a From 4e8c99d6076cee6e6bc639360cf743bef2a9ef17 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 3 Aug 2023 00:52:15 +0900 Subject: [PATCH 085/132] bump release --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index f043094..0e3189a 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -40,7 +40,7 @@ Name: ngspice Version: %{fedoraver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A mixed level/signal circuit simulator License: BSD From 0f552ccdb92be689a0eeeaf3324c16a3203bae69 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 6 Aug 2023 22:15:43 +0900 Subject: [PATCH 086/132] update to the latest git --- ngspice.spec | 10 +++++----- sources | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 0e3189a..2dd181f 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -20,13 +20,13 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -# master -%global gitcommit 75ce3c95e333454e0709bb1651e28d0303ded911 -%global gitdate 20230731 +# pre-master +%global gitcommit 78405474083b267d6782d34018c034c21795190e +%global gitdate 20230806 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230802 -%global tarballtime 2232 +%global tarballdate 20230806 +%global tarballtime 2138 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 1e75bdb..a03e78a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230802T2232.tar.gz) = c04f82a2f5390ea3fbbbf897b330db6fa67981a52a0097efcf32668d65a70cba5783330ea5b47e05c45aa2c2c70b4128bba17dbe67798416dcdc058928958398 +SHA512 (ngspice-20230806T2138.tar.gz) = 24630f1c78b519aaf792d09504124206efe9c55bfff2128c8f390398be5a3b2822e049567cf837f78de7164202893be2dac7b8daf0792ed6ad8b5242306c3922 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From 21c52aad662445633a403186e837a1103de80ec9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Aug 2023 17:29:28 +0900 Subject: [PATCH 087/132] update to the latest git --- ngspice.spec | 10 +++++----- sources | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 2dd181f..4802bcd 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -20,13 +20,13 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -# pre-master -%global gitcommit 78405474083b267d6782d34018c034c21795190e -%global gitdate 20230806 +# master +%global gitcommit d4c54123d493e0d7876c23a8f6cd8c5170d64641 +%global gitdate 20230806_2 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230806 -%global tarballtime 2138 +%global tarballdate 20230808 +%global tarballtime 1718 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index a03e78a..7a4bfd5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230806T2138.tar.gz) = 24630f1c78b519aaf792d09504124206efe9c55bfff2128c8f390398be5a3b2822e049567cf837f78de7164202893be2dac7b8daf0792ed6ad8b5242306c3922 +SHA512 (ngspice-20230808T1718.tar.gz) = a4c2c853fb9345c46ec12ac26e5c51b13a1b838d315b31295ce2b5e6d559a972f9668f38c64d63c214ce2bb9794c197dfff990c0cebd776dd06bf6ca13ee4541 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From bfc38ec700e2377fe997218a649c639e03f18346 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 12 Aug 2023 22:32:38 +0900 Subject: [PATCH 088/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 4802bcd..843747f 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # master -%global gitcommit d4c54123d493e0d7876c23a8f6cd8c5170d64641 -%global gitdate 20230806_2 +%global gitcommit b893e32d75a9d4d69c94445fe772c9347139a04c +%global gitdate 20230812 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230808 -%global tarballtime 1718 +%global tarballdate 20230812 +%global tarballtime 2225 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 7a4bfd5..92fe7d1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230808T1718.tar.gz) = a4c2c853fb9345c46ec12ac26e5c51b13a1b838d315b31295ce2b5e6d559a972f9668f38c64d63c214ce2bb9794c197dfff990c0cebd776dd06bf6ca13ee4541 +SHA512 (ngspice-20230812T2225.tar.gz) = 96f82c9fb4d2964e60be67325ee07241cbc9cae08334899e4019216536013819fd3b00dc87082f0b3e5355aa7337806b8c180a878c0821e5f805ae539d2ff4c5 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From 55f6e4dbb049146372e5041b0861c3f182aff161 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 13 Aug 2023 22:18:14 +0900 Subject: [PATCH 089/132] update to the latest git --- ngspice.spec | 10 +++++----- sources | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 843747f..78396e1 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # master -%global gitcommit b893e32d75a9d4d69c94445fe772c9347139a04c -%global gitdate 20230812 +%global gitcommit 43e31563434edccbe5d7c820ee00037264fcb42d +%global gitdate 20230813 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230812 -%global tarballtime 2225 +%global tarballdate 20230813 +%global tarballtime 2211 %endif %if 0%{?userelease} >= 1 @@ -40,7 +40,7 @@ Name: ngspice Version: %{fedoraver} -Release: 2%{?dist} +Release: 1%{?dist} Summary: A mixed level/signal circuit simulator License: BSD diff --git a/sources b/sources index 92fe7d1..a92c08f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230812T2225.tar.gz) = 96f82c9fb4d2964e60be67325ee07241cbc9cae08334899e4019216536013819fd3b00dc87082f0b3e5355aa7337806b8c180a878c0821e5f805ae539d2ff4c5 +SHA512 (ngspice-20230813T2211.tar.gz) = abac66ab7e4633427b98b6b6e3c0b0c236eb4ab57bd926b01978ab4dfc041509124a2cc84cf7d98a216fd7f5057697882cf72a32140a7944ee3c1496a043278d SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From 8cadd2c27bf821ac4b30ed1f75bbbfcb76adf962 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 16 Aug 2023 08:02:31 +0900 Subject: [PATCH 090/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 78396e1..9631dfb 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # master -%global gitcommit 43e31563434edccbe5d7c820ee00037264fcb42d -%global gitdate 20230813 +%global gitcommit 2275fb85da31a8c802ebf9730935c8c00d6cdea0 +%global gitdate 20230814 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230813 -%global tarballtime 2211 +%global tarballdate 20230816 +%global tarballtime 0753 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index a92c08f..603b2a6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230813T2211.tar.gz) = abac66ab7e4633427b98b6b6e3c0b0c236eb4ab57bd926b01978ab4dfc041509124a2cc84cf7d98a216fd7f5057697882cf72a32140a7944ee3c1496a043278d +SHA512 (ngspice-20230816T0753.tar.gz) = a31b50c922fdc7caf3c28cf599c44f59590e012bf702ad60a8b52f6dfe0d6ccb93efdde9286fa454df9bade90c6c916153e7f79535bb3748a957e49b0cbb235d SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From 508a2485266124b7b7b9612a22bf70452f297503 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 16 Aug 2023 11:16:59 +0900 Subject: [PATCH 091/132] Update to 41 --- ngspice.spec | 11 +++++++---- sources | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 9631dfb..f976e1c 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,17 +5,17 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global majorver 40 +%global majorver 41 #%%global minorver 3 -%global docver 40 +%global docver 41 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -452,6 +452,9 @@ popd %{_includedir}/ngspice/ %changelog +* Wed Aug 16 2023 Mamoru TASAKA - 41-1 +- Update to 41 + * Thu Jul 20 2023 Fedora Release Engineering - 40-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 603b2a6..6630f0a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20230816T0753.tar.gz) = a31b50c922fdc7caf3c28cf599c44f59590e012bf702ad60a8b52f6dfe0d6ccb93efdde9286fa454df9bade90c6c916153e7f79535bb3748a957e49b0cbb235d +SHA512 (ngspice-41.tar.gz) = fb0960cc9fcde1871fad82571cacebb1f5cce09ee3297cc938a24b88173ed102a2cb3f246599cdfbde7275e45e3d551edd0368e3ba6e79c592937c4cc466325e +SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From 6a5fdf14afe2bab90a33551f405d0f0bb036692e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 4 Nov 2023 23:06:04 +0900 Subject: [PATCH 092/132] update to the latest git --- ngspice.spec | 14 +++++++------- sources | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index f976e1c..c674202 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -20,13 +20,13 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %if 0%{?usegitbare} >= 1 -# master -%global gitcommit 2275fb85da31a8c802ebf9730935c8c00d6cdea0 -%global gitdate 20230814 +# pre-master-42 +%global gitcommit 04c68d5f30f5fd7bbf64e7431ad6e8c2adcb64ce +%global gitdate 20231028 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20230816 -%global tarballtime 0753 +%global tarballdate 20231104 +%global tarballtime 2255 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 6630f0a..d13259d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-41.tar.gz) = fb0960cc9fcde1871fad82571cacebb1f5cce09ee3297cc938a24b88173ed102a2cb3f246599cdfbde7275e45e3d551edd0368e3ba6e79c592937c4cc466325e -SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 +SHA512 (ngspice-20231104T2255.tar.gz) = 238dd512adc8fe3dcdce10b79dcf39ffefa36a5613ad2f9cfccd1ebd8d5c19bff8d73b6c8b77f75b4555a4bb7dc69e783ec1492c84b6ededc9599a562f119ccd SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a +SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 From 7149c6d64e5822b9b3e30ab870ef642a27830da6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 4 Nov 2023 23:16:20 +0900 Subject: [PATCH 093/132] update to the latest git --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index d13259d..485de46 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (ngspice-20231104T2255.tar.gz) = 238dd512adc8fe3dcdce10b79dcf39ffefa36a5613ad2f9cfccd1ebd8d5c19bff8d73b6c8b77f75b4555a4bb7dc69e783ec1492c84b6ededc9599a562f119ccd SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-40-manual.pdf) = 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 +SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 From a682309834d53acb5230075715f344dc0f2defa5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Nov 2023 09:37:25 +0900 Subject: [PATCH 094/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index c674202..df08a7e 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-42 -%global gitcommit 04c68d5f30f5fd7bbf64e7431ad6e8c2adcb64ce -%global gitdate 20231028 +%global gitcommit 4e1452cdb7f9f1e6eb9678b74524a36b9e9bfcea +%global gitdate 20231104 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20231104 -%global tarballtime 2255 +%global tarballdate 20231106 +%global tarballtime 0930 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 485de46..71bf0d7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20231104T2255.tar.gz) = 238dd512adc8fe3dcdce10b79dcf39ffefa36a5613ad2f9cfccd1ebd8d5c19bff8d73b6c8b77f75b4555a4bb7dc69e783ec1492c84b6ededc9599a562f119ccd +SHA512 (ngspice-20231106T0930.tar.gz) = b929f85b36808879d9042bc044f3190112d11a83e91817c78a89a043ad975be7371048f2e6a87e1f3da8440ef686e9b82fbe31f1ddda55fc7c9bfa64c42799c1 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 From 6ce601b283dcd61078ab9dd89577de4d4a31ea48 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Nov 2023 21:58:42 +0900 Subject: [PATCH 095/132] trial fix --- ngspice-42dev-adms-admst-revert.patch | 13 +++++++++++++ ngspice.spec | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ngspice-42dev-adms-admst-revert.patch diff --git a/ngspice-42dev-adms-admst-revert.patch b/ngspice-42dev-adms-admst-revert.patch new file mode 100644 index 0000000..167d02c --- /dev/null +++ b/ngspice-42dev-adms-admst-revert.patch @@ -0,0 +1,13 @@ +diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml +index eca9991f1..725d6d51e 100644 +--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml ++++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml +@@ -280,8 +280,6 @@ typedef struct s$(module)instance { + + + +-#define $(module)numStates 0 +- + #ifdef KLU + + diff --git a/ngspice.spec b/ngspice.spec index df08a7e..c405083 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -60,6 +60,7 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch +Patch1: ngspice-42dev-adms-admst-revert.patch BuildRequires: make BuildRequires: gcc @@ -73,7 +74,7 @@ BuildRequires: libICE-devel BuildRequires: libXaw-devel BuildRequires: libGL-devel BuildRequires: libXt-devel -# From ngspice 32 +# From ngspice 32s BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: libXft-devel @@ -189,6 +190,8 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +%patch -P1 -p1 +git commit -m "Temporarily revert" -a # make sure the examples are UTF-8... for nonUTF8 in \ From 976dfbd62be42da1d121f5894672bc6d0aab0bca Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Nov 2023 22:03:50 +0900 Subject: [PATCH 096/132] undo typo --- ngspice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index c405083..bf5f600 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -74,7 +74,7 @@ BuildRequires: libICE-devel BuildRequires: libXaw-devel BuildRequires: libGL-devel BuildRequires: libXt-devel -# From ngspice 32s +# From ngspice 32 BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: libXft-devel From 23cdbb13a841406e40bb2417163a09a988ed205e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 6 Nov 2023 23:48:12 +0900 Subject: [PATCH 097/132] more revert --- ngspice-42dev-xspice-icm-revert.patch | 13 +++++++++++++ ngspice.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 ngspice-42dev-xspice-icm-revert.patch diff --git a/ngspice-42dev-xspice-icm-revert.patch b/ngspice-42dev-xspice-icm-revert.patch new file mode 100644 index 0000000..a8d15d5 --- /dev/null +++ b/ngspice-42dev-xspice-icm-revert.patch @@ -0,0 +1,13 @@ +diff --git a/src/xspice/icm/GNUmakefile.in b/src/xspice/icm/GNUmakefile.in +index 78e578e99..7c01c9b26 100644 +--- a/src/xspice/icm/GNUmakefile.in ++++ b/src/xspice/icm/GNUmakefile.in +@@ -102,7 +102,7 @@ cm-descr := \ + cm-clean : + -rm -f $(cm)/$(cm).cm + -rm -f $(cm-descr) $(cm-objs) $(cm-gens) +- -rm -f $(cm)/*/*.o $(cm)/*/*.c $(cm)/*/.deps/* ++ -rm -f $(cm)/*/*.o $(cm)/*/.deps/* + -rm -f $(cm-deps) + + cm-distclean : diff --git a/ngspice.spec b/ngspice.spec index bf5f600..4e574ac 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -61,6 +61,7 @@ Source10: create-ngspice-git-bare-tarball.sh # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch Patch1: ngspice-42dev-adms-admst-revert.patch +Patch2: ngspice-42dev-xspice-icm-revert.patch BuildRequires: make BuildRequires: gcc @@ -191,6 +192,7 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a %patch -P1 -p1 +%patch -P2 -p1 git commit -m "Temporarily revert" -a # make sure the examples are UTF-8... From 3ea15aa50fadde9ba9fa96ef17301793fb7d6ddf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 12 Nov 2023 22:42:04 +0900 Subject: [PATCH 098/132] update to the latest git --- ngspice-42dev-xspice-icm-revert.patch | 13 ------------- ngspice.spec | 12 ++++++------ sources | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 ngspice-42dev-xspice-icm-revert.patch diff --git a/ngspice-42dev-xspice-icm-revert.patch b/ngspice-42dev-xspice-icm-revert.patch deleted file mode 100644 index a8d15d5..0000000 --- a/ngspice-42dev-xspice-icm-revert.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/xspice/icm/GNUmakefile.in b/src/xspice/icm/GNUmakefile.in -index 78e578e99..7c01c9b26 100644 ---- a/src/xspice/icm/GNUmakefile.in -+++ b/src/xspice/icm/GNUmakefile.in -@@ -102,7 +102,7 @@ cm-descr := \ - cm-clean : - -rm -f $(cm)/$(cm).cm - -rm -f $(cm-descr) $(cm-objs) $(cm-gens) -- -rm -f $(cm)/*/*.o $(cm)/*/*.c $(cm)/*/.deps/* -+ -rm -f $(cm)/*/*.o $(cm)/*/.deps/* - -rm -f $(cm-deps) - - cm-distclean : diff --git a/ngspice.spec b/ngspice.spec index 4e574ac..188b5d5 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -21,12 +21,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-42 -%global gitcommit 4e1452cdb7f9f1e6eb9678b74524a36b9e9bfcea -%global gitdate 20231104 +%global gitcommit c87df54f24969de0c9d503c349258d9953ae208a +%global gitdate 20231111 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20231106 -%global tarballtime 0930 +%global tarballdate 20231112 +%global tarballtime 1636 %endif %if 0%{?userelease} >= 1 @@ -61,7 +61,6 @@ Source10: create-ngspice-git-bare-tarball.sh # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch Patch1: ngspice-42dev-adms-admst-revert.patch -Patch2: ngspice-42dev-xspice-icm-revert.patch BuildRequires: make BuildRequires: gcc @@ -192,7 +191,6 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a %patch -P1 -p1 -%patch -P2 -p1 git commit -m "Temporarily revert" -a # make sure the examples are UTF-8... @@ -280,6 +278,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --disable-silent-rules \ --enable-adms \ --enable-xspice \ + --enable-klu \ --enable-osdi \ --enable-maintainer-mode \ --enable-dependency-tracking \ @@ -320,6 +319,7 @@ do --enable-adms \ --enable-xspice \ --enable-osdi \ + --enable-klu \ --enable-maintainer-mode \ --enable-dependency-tracking \ --enable-cider \ diff --git a/sources b/sources index 71bf0d7..3bb3d30 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ngspice-20231106T0930.tar.gz) = b929f85b36808879d9042bc044f3190112d11a83e91817c78a89a043ad975be7371048f2e6a87e1f3da8440ef686e9b82fbe31f1ddda55fc7c9bfa64c42799c1 +SHA512 (ngspice-20231112T1636.tar.gz) = b6a560e0c4d9f7d6fec7f8b069849cb812a37f3982fb5c202749e1a4501140fe22c1b28567991ffa1134f2a71715a9b7fe412cf477f23dc7742dd64c4e673662 SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 From c7e34909cdbb3fb448f45a75affd2eb58d41d75a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Dec 2023 12:38:21 +0900 Subject: [PATCH 099/132] Update to ngspice 42 --- ngspice-42dev-adms-admst-revert.patch | 13 ----------- ngspice.spec | 31 ++++++++++++++++++++------- 2 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 ngspice-42dev-adms-admst-revert.patch diff --git a/ngspice-42dev-adms-admst-revert.patch b/ngspice-42dev-adms-admst-revert.patch deleted file mode 100644 index 167d02c..0000000 --- a/ngspice-42dev-adms-admst-revert.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml -index eca9991f1..725d6d51e 100644 ---- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml -+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml -@@ -280,8 +280,6 @@ typedef struct s$(module)instance { - - - --#define $(module)numStates 0 -- - #ifdef KLU - - diff --git a/ngspice.spec b/ngspice.spec index 188b5d5..5521929 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,17 +5,17 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global majorver 41 +%global majorver 42 #%%global minorver 3 -%global docver 41 +%global docver 42 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -36,6 +36,8 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif +%bcond_with adms + %undefine _changelog_trimtime Name: ngspice @@ -60,7 +62,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch -Patch1: ngspice-42dev-adms-admst-revert.patch BuildRequires: make BuildRequires: gcc @@ -171,6 +172,7 @@ git config user.email "%{name}-maintainers@fedoraproject.org" git checkout -b %{name}-%{majorver}-fedora %{gitcommit} %endif +%if %{with adms} pushd src/spicelib/devices/adms %if 0%{?userelease} >= 1 7za x %{SOURCE2} @@ -186,12 +188,12 @@ do test -f $f || exit 1 done %endif + popd +%endif %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -%patch -P1 -p1 -git commit -m "Temporarily revert" -a # make sure the examples are UTF-8... for nonUTF8 in \ @@ -240,7 +242,11 @@ sed -i \ git commit -m "Fix include path" -a export ACLOCAL_FLAGS=-Im4 -./autogen.sh --adms +./autogen.sh \ +%if %{with adms} + --adms \ +%endif + %{nil} git commit -m "Execute autogen" -a || : chmod +x configure @@ -276,7 +282,9 @@ export CPPFLAGS=-DUSE_INTERP_RESULT # by the request from the upstream %configure \ --disable-silent-rules \ +%if %{with adms} --enable-adms \ +%endif --enable-xspice \ --enable-klu \ --enable-osdi \ @@ -316,7 +324,9 @@ do %configure \ --disable-silent-rules \ ${SHARED_OPT} \ +%if %{with adms} --enable-adms \ +%endif --enable-xspice \ --enable-osdi \ --enable-klu \ @@ -457,6 +467,11 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Dec 29 2023 Mamoru TASAKA - 42-1 +- Update to 42 +- Kill --with-adms +- Enable --with-klu + * Wed Aug 16 2023 Mamoru TASAKA - 41-1 - Update to 41 From a935e39f317fe757f21e59bcb6e79d1615d620f6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Dec 2023 12:40:01 +0900 Subject: [PATCH 100/132] remove adms source file --- ngspice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngspice.spec b/ngspice.spec index 5521929..01488ff 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -55,7 +55,9 @@ Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{ma Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz %endif Source1: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-%{docver}-manual.pdf +%if %{with adms} Source2: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-adms-va.7z +%endif Source10: create-ngspice-git-bare-tarball.sh From 935d270f73e58823100c4b2ada242a4541d32ae5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Dec 2023 12:44:14 +0900 Subject: [PATCH 101/132] upload source --- sources | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 3bb3d30..1ec5334 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (ngspice-20231112T1636.tar.gz) = b6a560e0c4d9f7d6fec7f8b069849cb812a37f3982fb5c202749e1a4501140fe22c1b28567991ffa1134f2a71715a9b7fe412cf477f23dc7742dd64c4e673662 -SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a -SHA512 (ngspice-41-manual.pdf) = 51569cc774e0d5dda8d6e24122050515d6eda7719488534fe0a32b43d6bb34655472455d62d83bcb6d3847878bd26c7e45976a1eec256b321547b768858f6d74 +SHA512 (ngspice-42.tar.gz) = 37fbabd8e537ac8efe02731e54a0c586588e48010a8022daeeb53442b8ebdf3f1ea866e8d6eb180c130cabba2ae6675bc8741208ad2a20091d2c753eec9b4d55 +SHA512 (ngspice-42-manual.pdf) = 9251231fb3e33e5961e10cd2d2317003bc3d72f211224f7db743fe6f80f20ef7f25daad84810b3869239d248a04e97dd6fa375416c6b0180370904fb5e5cdd74 From ad61317e3833980ee92a9757886906a40e61977d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Jan 2024 17:14:01 +0900 Subject: [PATCH 102/132] Fix compilation with -Werror=incompatible-pointer-types --- ngspice-42-pointer-type-cast-c99.patch | 11 +++++++++++ ngspice.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ngspice-42-pointer-type-cast-c99.patch diff --git a/ngspice-42-pointer-type-cast-c99.patch b/ngspice-42-pointer-type-cast-c99.patch new file mode 100644 index 0000000..606505c --- /dev/null +++ b/ngspice-42-pointer-type-cast-c99.patch @@ -0,0 +1,11 @@ +--- ngspice-42/src/tclspice.c.type 2023-12-28 03:58:03.000000000 +0900 ++++ ngspice-42/src/tclspice.c 2024-01-21 15:53:13.123052910 +0900 +@@ -2433,7 +2433,7 @@ tmeasure TCL_CMDPROCARGS(clientData, int + return TCL_ERROR; + } + +- wl = wl_build((char **)argv); ++ wl = wl_build((const char * const *)argv); + + get_measure2(wl, &mvalue, NULL, FALSE); + diff --git a/ngspice.spec b/ngspice.spec index 01488ff..e20e146 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -42,9 +42,10 @@ Name: ngspice Version: %{fedoraver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A mixed level/signal circuit simulator +# ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause License: BSD URL: http://ngspice.sourceforge.net @@ -64,6 +65,8 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch +# Fix compilation with C99 -Werror=incompatible-pointer-types +Patch1: ngspice-42-pointer-type-cast-c99.patch BuildRequires: make BuildRequires: gcc @@ -196,6 +199,8 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +%patch -P1 -p1 -b .type +git commit -m "Fix pointer cast for -Werror=incompatible-pointer-types" -a # make sure the examples are UTF-8... for nonUTF8 in \ @@ -469,6 +474,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sun Jan 21 2024 Mamoru TASAKA - 42-2 +- Fix compilation with -Werror=incompatible-pointer-types + * Fri Dec 29 2023 Mamoru TASAKA - 42-1 - Update to 42 - Kill --with-adms From 9a77728f1b626e1daf90b8e295d4c5e0ec6cdcbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:59:22 +0000 Subject: [PATCH 103/132] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index e20e146..97888af 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -42,7 +42,7 @@ Name: ngspice Version: %{fedoraver} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -474,6 +474,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 42-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Mamoru TASAKA - 42-2 - Fix compilation with -Werror=incompatible-pointer-types From a8d6bf0885b405a6e10c62aa8d8710c2ea09ae13 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 2 Feb 2024 16:35:24 +0900 Subject: [PATCH 104/132] add reference --- ngspice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ngspice.spec b/ngspice.spec index 97888af..27d4d2c 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -66,6 +66,7 @@ Source10: create-ngspice-git-bare-tarball.sh # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch # Fix compilation with C99 -Werror=incompatible-pointer-types +# https://sourceforge.net/p/ngspice/bugs/659/ Patch1: ngspice-42-pointer-type-cast-c99.patch BuildRequires: make From 0aa55a0368bccc4c463fb8eb8dbc6390a05a71c5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Mar 2024 14:42:59 +0900 Subject: [PATCH 105/132] once save --- License-analysis.txt | 127 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 License-analysis.txt diff --git a/License-analysis.txt b/License-analysis.txt new file mode 100644 index 0000000..9d8ae27 --- /dev/null +++ b/License-analysis.txt @@ -0,0 +1,127 @@ +CC-BY-SA-4.0 +COPYING +FAQ +manal.pdf + +??? +src/frontend/get_phys_mem_size.c +src/frontend/get_resident_set_size.c + +GPL-2.0-or-later +src/xspice/icm/table/table2D/cfunc.mod +src/xspice/icm/table/table3D/cfunc.mod +src/spicelib/devices/adms/admst/COPYING +src/spicelib/devices/adms/admst/ngspice*.xml +src/xspice/icm/table/mada/alloc.c +src/xspice/icm/table/mada/eno.c +src/xspice/icm/table/mada/eno2.c +src/xspice/icm/table/mada/eno3.c + +GPL-2.0-only +src/xspice/icm/table/table2D/ifspec.ifs +src/xspice/icm/table/table3D/ifspec.ifs + +GPL-3.0-or-later +src/frontend/parse-bison.c +src/frontend/parse-bison.h +src/spicelib/parser/inpptree-parser.c +src/spicelib/parser/inpptree-parser.h +src/xspice/cmpp/ifs_yacc.c +src/xspice/cmpp/ifs_yacc.h +src/xspice/cmpp/mod_yacc.c +src/xspice/cmpp/mod_yacc.h + +LGPL-2.1-or-later +README.tcl +src/frontend/numparam/mystring.c +src/frontend/numparam/readme.txt +src/frontend/numparam/spicenum.c +src/frontend/numparam/xpressn.c +src/maths/KLU/colamd.c +src/spicelib/devices/adms/admst/COPYING + +LGPL-2.1-only +src/maths/KLU/colamd_global.c +src/tclspice.c + +MPL-2.0 +src/include/cppduals/duals/dual +src/osdi/ + +ECL-2.0 +examples/osdi/EKV2.6/ekv26_mod.va +src/spicelib/devices/bsim4/ + +HPND +src/maths/sparse/ + +BSD-4-Clause +src/misc/getopt_bsd.h + +BSD-3-Clause +src/frontend/com_wr_ic.c +src/frontend/com_wr_ic.h +src/frontend/get_avail_mem_size.c +src/frontend/inpcom.c + +src/frontend/inpcompat.c (BCD) +src/frontend/inpcompat.h (BCD) +src/frontend/inpc_probe.c +src/include/ngspice/sharedspice.h +src/misc/dstring.c +src/sharedspice.c +src/spicelib/analysis/optran.c +src/spicelib/devices/cpl/cpldelete.c +src/spicelib/devices/cpl/cplhash.c +src/spicelib/devices/cpl/cplhash.h +src/spicelib/devices/cpl/cplmdel.c +src/spicelib/devices/hicum2/ +src/spicelib/parser/inpgmod.c +src/winmain.c +src/xspice/icm/digital/d_process/cfunc.mod +src/xspice/icm/dlmain.c +src/xspice/icm/dlmain.h +src/xspice/icm/xtradev/pswitch/cfunc.mod +src/xspice/icm/xtradev/sidiode/cfunc.mod +src/xspice/icm/xtradev/sidiode/ifspec.ifs + + + +BSD-2-Clause +src/misc/getopt_long_bsd.c + +??? +examples/p-to-n-examples/MCP6041.txt + +??? +examples/probe/TLC555.LIB + +??? +src/frontend/commands.c + +??? +src/spicelib/devices/bsim3/B3TERMS_OF_USE +src/spicelib/devices/bsim3soi_dd/BsimTerms_use +src/spicelib/devices/bsim3soi_fd/BsimTerms_use +src/spicelib/devices/bsim3soi_pd/BsimTerms_use +src/spicelib/devices/bsim3v32/B3TERMS_OF_USE +src/spicelib/devices/bsim4/B4TERMS_OF_USEs +src/spicelib/devices/bsim4v5/B4TERMS_OF_USE +src/spicelib/devices/bsim4v6/B4TERMS_OF_USE +src/spicelib/devices/bsim4v7/B4TERMS_OF_USE +src/spicelib/devices/bsimsoi/BsimTerms_use + +??? +src/spicelib/devices/dev.c + +??? +src/spicelib/devices/hisim/ +src/spicelib/devices/hisimhv2/ + +??? +src/spicelib/devices/hisimhv1/ + + +??? +src/spicelib/devices/soi3/README + From 67864ee918e42db1b38bdfd52d5534bb0d723b62 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Mar 2024 15:08:49 +0900 Subject: [PATCH 106/132] once save --- License-analysis.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/License-analysis.txt b/License-analysis.txt index 9d8ae27..d5459fa 100644 --- a/License-analysis.txt +++ b/License-analysis.txt @@ -3,7 +3,7 @@ COPYING FAQ manal.pdf -??? +CC-BY-3.0 src/frontend/get_phys_mem_size.c src/frontend/get_resident_set_size.c @@ -86,7 +86,6 @@ src/xspice/icm/xtradev/sidiode/cfunc.mod src/xspice/icm/xtradev/sidiode/ifspec.ifs - BSD-2-Clause src/misc/getopt_long_bsd.c @@ -96,10 +95,11 @@ examples/p-to-n-examples/MCP6041.txt ??? examples/probe/TLC555.LIB -??? +NOT_IN_SPDX src/frontend/commands.c +src/spicelib/devices/dev.c -??? +NOT_IN_SPDX src/spicelib/devices/bsim3/B3TERMS_OF_USE src/spicelib/devices/bsim3soi_dd/BsimTerms_use src/spicelib/devices/bsim3soi_fd/BsimTerms_use @@ -111,11 +111,9 @@ src/spicelib/devices/bsim4v6/B4TERMS_OF_USE src/spicelib/devices/bsim4v7/B4TERMS_OF_USE src/spicelib/devices/bsimsoi/BsimTerms_use -??? -src/spicelib/devices/dev.c ??? -src/spicelib/devices/hisim/ +src/spicelib/devices/hisim2/ src/spicelib/devices/hisimhv2/ ??? From 7777750ae0ecaa0f13a424ed971bb09e73b2d959 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 14 Jul 2024 20:47:27 +0900 Subject: [PATCH 107/132] Update to 43 --- ngspice-42-pointer-type-cast-c99.patch | 11 ----------- ngspice.spec | 14 ++++++-------- sources | 4 ++-- 3 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 ngspice-42-pointer-type-cast-c99.patch diff --git a/ngspice-42-pointer-type-cast-c99.patch b/ngspice-42-pointer-type-cast-c99.patch deleted file mode 100644 index 606505c..0000000 --- a/ngspice-42-pointer-type-cast-c99.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ngspice-42/src/tclspice.c.type 2023-12-28 03:58:03.000000000 +0900 -+++ ngspice-42/src/tclspice.c 2024-01-21 15:53:13.123052910 +0900 -@@ -2433,7 +2433,7 @@ tmeasure TCL_CMDPROCARGS(clientData, int - return TCL_ERROR; - } - -- wl = wl_build((char **)argv); -+ wl = wl_build((const char * const *)argv); - - get_measure2(wl, &mvalue, NULL, FALSE); - diff --git a/ngspice.spec b/ngspice.spec index 27d4d2c..aba11ad 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -13,9 +13,9 @@ %global userelease 1 %endif -%global majorver 42 +%global majorver 43 #%%global minorver 3 -%global docver 42 +%global docver 43 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -42,7 +42,7 @@ Name: ngspice Version: %{fedoraver} -Release: 3%{?dist} +Release: 1%{?dist} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -65,9 +65,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch -# Fix compilation with C99 -Werror=incompatible-pointer-types -# https://sourceforge.net/p/ngspice/bugs/659/ -Patch1: ngspice-42-pointer-type-cast-c99.patch BuildRequires: make BuildRequires: gcc @@ -200,8 +197,6 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -%patch -P1 -p1 -b .type -git commit -m "Fix pointer cast for -Werror=incompatible-pointer-types" -a # make sure the examples are UTF-8... for nonUTF8 in \ @@ -475,6 +470,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sun Jul 14 2024 Mamoru TASAKA - 43-1 +- Update to 43 + * Thu Jan 25 2024 Fedora Release Engineering - 42-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 1ec5334..71dd2a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-42.tar.gz) = 37fbabd8e537ac8efe02731e54a0c586588e48010a8022daeeb53442b8ebdf3f1ea866e8d6eb180c130cabba2ae6675bc8741208ad2a20091d2c753eec9b4d55 -SHA512 (ngspice-42-manual.pdf) = 9251231fb3e33e5961e10cd2d2317003bc3d72f211224f7db743fe6f80f20ef7f25daad84810b3869239d248a04e97dd6fa375416c6b0180370904fb5e5cdd74 +SHA512 (ngspice-43.tar.gz) = ad938e6ea8f9874c04d1033599bf39d3728e763fbd42ba77bd036b6c00271600695b3656f3f34547c39153382f55e7d7d5d6cb732f272d149cdbe21988c0d636 +SHA512 (ngspice-43-manual.pdf) = 01bd68983c10ca8ef2a399354290032a0e9a9881159a3781459c576e662efa91af403ef191e846694ef418a8aec3e867d8e916d8a41a6d616d3169daf22be444 From 5b35268337f087128887d6f654f0917bade379a4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 00:05:51 +0900 Subject: [PATCH 108/132] try sanitizer --- ngspice.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index aba11ad..84bc165 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,6 +19,8 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') +%global mainrelease 1 + %if 0%{?usegitbare} >= 1 # pre-master-42 %global gitcommit c87df54f24969de0c9d503c349258d9953ae208a @@ -36,13 +38,20 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif +%global use_gcc_strict_sanitize 1 + +%global flagrel %{nil} +%if 0%{?use_gcc_strict_sanitize} >= 1 +%global flagrel %{flagrel}.san +%endif + %bcond_with adms %undefine _changelog_trimtime Name: ngspice Version: %{fedoraver} -Release: 1%{?dist} +Release: %{mainrelease}%{?dist}%{flagrel} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -69,6 +78,10 @@ Patch0: ngspice-37-blt-linkage-workaround.patch BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ +%if 0%{?use_gcc_strict_sanitize} +BuildRequires: libasan +BuildRequires: libubsan +%endif BuildRequires: p7zip BuildRequires: readline-devel @@ -255,6 +268,12 @@ git commit -m "Execute autogen" -a || : chmod +x configure %build +%set_build_flags +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export CXX="${CXX} -fsanitize=address -fsanitize=undefined" +%endif + %if 0%{?usegitbare} >= 1 cd %{name} %endif From 6fff1cbbaa6287c63a4cae31c70564343492d907 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 00:09:22 +0900 Subject: [PATCH 109/132] Revert "try sanitizer" This reverts commit 5b35268337f087128887d6f654f0917bade379a4. --- ngspice.spec | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 84bc165..aba11ad 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,8 +19,6 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrelease 1 - %if 0%{?usegitbare} >= 1 # pre-master-42 %global gitcommit c87df54f24969de0c9d503c349258d9953ae208a @@ -38,20 +36,13 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif -%global use_gcc_strict_sanitize 1 - -%global flagrel %{nil} -%if 0%{?use_gcc_strict_sanitize} >= 1 -%global flagrel %{flagrel}.san -%endif - %bcond_with adms %undefine _changelog_trimtime Name: ngspice Version: %{fedoraver} -Release: %{mainrelease}%{?dist}%{flagrel} +Release: 1%{?dist} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -78,10 +69,6 @@ Patch0: ngspice-37-blt-linkage-workaround.patch BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ -%if 0%{?use_gcc_strict_sanitize} -BuildRequires: libasan -BuildRequires: libubsan -%endif BuildRequires: p7zip BuildRequires: readline-devel @@ -268,12 +255,6 @@ git commit -m "Execute autogen" -a || : chmod +x configure %build -%set_build_flags -%if 0%{?use_gcc_strict_sanitize} -export CC="${CC} -fsanitize=address -fsanitize=undefined" -export CXX="${CXX} -fsanitize=address -fsanitize=undefined" -%endif - %if 0%{?usegitbare} >= 1 cd %{name} %endif From d4acaf30dc19d6c878e492514ceb526af24bd0e8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 00:10:05 +0900 Subject: [PATCH 110/132] try sanitizer --- ngspice.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index aba11ad..84bc165 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,6 +19,8 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') +%global mainrelease 1 + %if 0%{?usegitbare} >= 1 # pre-master-42 %global gitcommit c87df54f24969de0c9d503c349258d9953ae208a @@ -36,13 +38,20 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif +%global use_gcc_strict_sanitize 1 + +%global flagrel %{nil} +%if 0%{?use_gcc_strict_sanitize} >= 1 +%global flagrel %{flagrel}.san +%endif + %bcond_with adms %undefine _changelog_trimtime Name: ngspice Version: %{fedoraver} -Release: 1%{?dist} +Release: %{mainrelease}%{?dist}%{flagrel} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -69,6 +78,10 @@ Patch0: ngspice-37-blt-linkage-workaround.patch BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ +%if 0%{?use_gcc_strict_sanitize} +BuildRequires: libasan +BuildRequires: libubsan +%endif BuildRequires: p7zip BuildRequires: readline-devel @@ -255,6 +268,12 @@ git commit -m "Execute autogen" -a || : chmod +x configure %build +%set_build_flags +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export CXX="${CXX} -fsanitize=address -fsanitize=undefined" +%endif + %if 0%{?usegitbare} >= 1 cd %{name} %endif From 40044a3b31716f608c54ce75c5c46b8b9743c502 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 00:15:41 +0900 Subject: [PATCH 111/132] disable leak check --- ngspice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngspice.spec b/ngspice.spec index 84bc165..466341e 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -444,6 +444,8 @@ chmod +x %{buildroot}%{_libdir}/ngspice/*.cm chmod +x %{buildroot}%{_libdir}/tclspice/ngspice/*.cm %check +export ASAN_OPTIONS=detect_leaks=0 + %if 0%{?usegitbare} >= 1 cd %{name} %endif From ae3eb82b5560a9d5f78a5c4cad1ca69a5ce2b45a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 09:38:38 +0900 Subject: [PATCH 112/132] suppress leak detection even for %%build --- ngspice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngspice.spec b/ngspice.spec index 466341e..0db57ba 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -272,6 +272,8 @@ chmod +x configure %if 0%{?use_gcc_strict_sanitize} export CC="${CC} -fsanitize=address -fsanitize=undefined" export CXX="${CXX} -fsanitize=address -fsanitize=undefined" + +export ASAN_OPTIONS=detect_leaks=0 %endif %if 0%{?usegitbare} >= 1 From f1b82bc108e01700896b17106622caa31a9d2faa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 16 Jul 2024 17:05:29 +0900 Subject: [PATCH 113/132] Apply upstream patch for fixing one byte ahead access in string manipulation --- ...x-one-byte-ahead-access-in-dup_strin.patch | 28 +++++++++++++++++++ ngspice.spec | 15 ++++++++-- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch diff --git a/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch b/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch new file mode 100644 index 0000000..fc577ad --- /dev/null +++ b/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch @@ -0,0 +1,28 @@ +From 38f6bbe5ec0bc77fcf4f564e716acd23372cef3a Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Tue, 16 Jul 2024 15:52:09 +0900 +Subject: [PATCH] misc/string.c: fix one byte ahead access in dup_string + +In dup_string in misc/string.c , even if the destination +buffer is allocated with n_char bytes, +the source buffer `str` can be accessed up to only n_char bytes. +--- + src/misc/string.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/misc/string.c b/src/misc/string.c +index 1374607da..97acd9c92 100644 +--- a/src/misc/string.c ++++ b/src/misc/string.c +@@ -78,7 +78,7 @@ char *dup_string(const char *str, size_t n_char) + char *p = TMALLOC(char, n_char + 1); + + if (p != NULL) { +- (void) memcpy(p, str, n_char + 1); ++ (void) memcpy(p, str, n_char); + p[n_char] = '\0'; + } + return p; +-- +2.45.2 + diff --git a/ngspice.spec b/ngspice.spec index 0db57ba..ab02007 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global mainrelease 1 +%global baserelease 2 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -38,7 +38,7 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global flagrel %{nil} %if 0%{?use_gcc_strict_sanitize} >= 1 @@ -51,7 +51,7 @@ Name: ngspice Version: %{fedoraver} -Release: %{mainrelease}%{?dist}%{flagrel} +Release: %{baserelease}%{?dist}%{flagrel} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause @@ -74,6 +74,11 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch +# https://sourceforge.net/p/ngspice/bugs/679/ +# https://sourceforge.net/p/ngspice/ngspice/merge-requests/19/ +# misc/string.c: fix one byte ahead access in dup_string +Patch19: MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch + BuildRequires: make BuildRequires: gcc @@ -210,6 +215,7 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a +cat %PATCH19 | git am # make sure the examples are UTF-8... for nonUTF8 in \ @@ -493,6 +499,9 @@ popd %{_includedir}/ngspice/ %changelog +* Tue Jul 16 2024 Mamoru TASAKA - 43-2 +- Apply upstream patch for fixing one byte ahead access in string manipulation + * Sun Jul 14 2024 Mamoru TASAKA - 43-1 - Update to 43 From 17e99c1c4777e6cc7f4ce6c32011f36179f1610e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:31:30 +0000 Subject: [PATCH 114/132] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index ab02007..bfff8a3 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 2 +%global baserelease 3 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -499,6 +499,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 43-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 16 2024 Mamoru TASAKA - 43-2 - Apply upstream patch for fixing one byte ahead access in string manipulation From 25e3b84421693d2cb091410dd955c9c6e552102e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 12:10:23 +0200 Subject: [PATCH 115/132] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ngspice.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index bfff8a3..1f6bb91 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 3 +%global baserelease 4 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -55,7 +55,8 @@ Release: %{baserelease}%{?dist}%{flagrel} Summary: A mixed level/signal circuit simulator # ngspice-42-manual.pdf CC-BY-SA-4.0 AND BSD-3-Clause -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://ngspice.sourceforge.net %if 0%{?userelease} >= 1 @@ -499,6 +500,9 @@ popd %{_includedir}/ngspice/ %changelog +* Mon Sep 2 2024 Miroslav Suchý - 43-4 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 43-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4a58d05773c02e5ab3071f13213c815f77bcda82 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 31 Dec 2024 09:25:03 +0900 Subject: [PATCH 116/132] Update to 44 --- ...x-one-byte-ahead-access-in-dup_strin.patch | 28 ------------------- ngspice.spec | 22 +++++++++------ sources | 4 +-- 3 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch diff --git a/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch b/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch deleted file mode 100644 index fc577ad..0000000 --- a/MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 38f6bbe5ec0bc77fcf4f564e716acd23372cef3a Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Tue, 16 Jul 2024 15:52:09 +0900 -Subject: [PATCH] misc/string.c: fix one byte ahead access in dup_string - -In dup_string in misc/string.c , even if the destination -buffer is allocated with n_char bytes, -the source buffer `str` can be accessed up to only n_char bytes. ---- - src/misc/string.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/misc/string.c b/src/misc/string.c -index 1374607da..97acd9c92 100644 ---- a/src/misc/string.c -+++ b/src/misc/string.c -@@ -78,7 +78,7 @@ char *dup_string(const char *str, size_t n_char) - char *p = TMALLOC(char, n_char + 1); - - if (p != NULL) { -- (void) memcpy(p, str, n_char + 1); -+ (void) memcpy(p, str, n_char); - p[n_char] = '\0'; - } - return p; --- -2.45.2 - diff --git a/ngspice.spec b/ngspice.spec index 1f6bb91..1c9fc86 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -13,13 +13,13 @@ %global userelease 1 %endif -%global majorver 43 +%global majorver 44 #%%global minorver 3 -%global docver 43 +%global docver 44 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 4 +%global baserelease 1 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -75,10 +75,6 @@ Source10: create-ngspice-git-bare-tarball.sh # Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or # not (bug 1047056, debian bug 737279) Patch0: ngspice-37-blt-linkage-workaround.patch -# https://sourceforge.net/p/ngspice/bugs/679/ -# https://sourceforge.net/p/ngspice/ngspice/merge-requests/19/ -# misc/string.c: fix one byte ahead access in dup_string -Patch19: MR19-misc-string.c-fix-one-byte-ahead-access-in-dup_strin.patch BuildRequires: make @@ -112,6 +108,7 @@ BuildRequires: flex BuildRequires: ImageMagick BuildRequires: mot-adms +BuildRequires: xorg-x11-server-Xvfb BuildRequires: git Requires: %{name}-codemodel%{?_isa} = %{version}-%{release} @@ -216,7 +213,6 @@ popd %patch -P0 -p2 -b .link git commit -m "Link libspice.so with -lBLT or -lBLIlite, depending on whether in tk mode or not" -a -cat %PATCH19 | git am # make sure the examples are UTF-8... for nonUTF8 in \ @@ -241,6 +237,7 @@ git commit -m "Fix permission" -a || : # Move spinit directory to arch-dependent sed -i configure.ac -e '\@AC_DEFINE_UNQUOTED.*NGSPICEDATADIR@s|echo .dprefix/share/ngspice|echo %{_libdir}/ngspice|' +sed -i configure.ac -e '\@AC_DEFINE_UNQUOTED.*NGSPICELIBDIR@s|echo .dprefix/share/ngspice|echo %{_libdir}/ngspice|' sed -i src/misc/ivars.c -e 's|\(["/]\)share/ngspice|\1%_lib/ngspice|' sed -i src/misc/ivars.c -e 's|\(["/]\)lib/ngspice|\1%_lib/ngspice|' grep -rl "(pkgdatadir)/" . | xargs sed -i -e 's|(pkgdatadir)/|(pkglibdir)/|' @@ -467,12 +464,15 @@ mkdir USERPROFILE echo "set ngbehavior=mc" > USERPROFILE/spice.rc export USERPROFILE=$(pwd)/USERPROFILE -make check +xvfb-run \ + -s "-screen 0 640x480x24" \ + make check popd %files %{_bindir}/* +%{_libdir}/%{name}/ivlng.* %{_mandir}/man1/* %doc %{_pkgdocdir} %license COPYING @@ -484,6 +484,7 @@ popd %{_libdir}/tclspice/libspice*.so* %{_libdir}/tclspice/%{name}/*.cm %{_libdir}/tclspice/%{name}/*.tcl +%{_libdir}/tclspice/%{name}/ivlng.* %{_libdir}/tclspice/%{name}/scripts/ %files codemodel @@ -500,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Mon Dec 30 2024 Mamoru TASAKA - 44-1 +- Update to 44 + * Mon Sep 2 2024 Miroslav Suchý - 43-4 - convert license to SPDX diff --git a/sources b/sources index 71dd2a7..ec8db21 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-43.tar.gz) = ad938e6ea8f9874c04d1033599bf39d3728e763fbd42ba77bd036b6c00271600695b3656f3f34547c39153382f55e7d7d5d6cb732f272d149cdbe21988c0d636 -SHA512 (ngspice-43-manual.pdf) = 01bd68983c10ca8ef2a399354290032a0e9a9881159a3781459c576e662efa91af403ef191e846694ef418a8aec3e867d8e916d8a41a6d616d3169daf22be444 +SHA512 (ngspice-44.tar.gz) = 63fc2dd0827dc2dba092b583bf46c97fece3cbdb2f2645a2e1972ca03f5b93b0191e3b65fe0c01abe2ae13355aaec9df0ef18b52e964c3050c5a09e126561a51 +SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From caa9d840f884fc01b87d99ae39c0117a457404ea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 12 Jan 2025 11:16:18 +0900 Subject: [PATCH 117/132] 44.2 --- ngspice.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 1c9fc86..b65e603 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -14,7 +14,7 @@ %endif %global majorver 44 -#%%global minorver 3 +%global minorver 2 %global docver 44 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -60,7 +60,7 @@ License: LicenseRef-Callaway-BSD URL: http://ngspice.sourceforge.net %if 0%{?userelease} >= 1 -Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}/ngspice-%{majorver}.tar.gz +Source0: https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{majorver}%{?minorver:.%minorver}/ngspice-%{majorver}%{?minorver:.%minorver}.tar.gz %endif %if 0%{?usegitbare} >= 1 Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz @@ -173,7 +173,7 @@ developing applications that use libngspice. %prep %if 0%{?userelease} >= 1 -%setup -q -n %{name}-%{majorver} +%setup -q -n %{name}-%{majorver}%{?minorver:.%minorver} git init git config user.name "%{name} maintainer" git config user.email "%{name}-maintainers@fedoraproject.org" @@ -429,7 +429,7 @@ cp -pr ./src/spicelib/devices/adms/ %{buildroot}%{_libdir}/%{name} # Ensuring that all docs are under %%{_pkgdocdir} mkdir -p %{buildroot}%{_pkgdocdir} cp -pr examples/ %{buildroot}%{_pkgdocdir} -install -cpm 0644 %{SOURCE1} %{buildroot}%{_pkgdocdir}/%{name}-%{version}.pdf +install -cpm 0644 %{SOURCE1} %{buildroot}%{_pkgdocdir}/%{name}-%{majorver}.pdf cp -a \ Stuarts_Poly_Notes \ @@ -501,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sun Jan 12 2025 Mamoru TASAKA - 44.2-1 +- Update to 44.2 + * Mon Dec 30 2024 Mamoru TASAKA - 44-1 - Update to 44 diff --git a/sources b/sources index ec8db21..2000db3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-44.tar.gz) = 63fc2dd0827dc2dba092b583bf46c97fece3cbdb2f2645a2e1972ca03f5b93b0191e3b65fe0c01abe2ae13355aaec9df0ef18b52e964c3050c5a09e126561a51 +SHA512 (ngspice-44.2.tar.gz) = b6cccf38d460f9aace5379db3b75c247b3aed04b902a2355e27b4ee3a64206b0ac8828c8685da3bf8e57c0746c10f39418849a4f31563e9f5ff7c05de0eb3ae2 SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 059e3a9a41d44f55144c4894f972a9bda1967b9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:07:59 +0000 Subject: [PATCH 118/132] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index b65e603..c4d197c 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 1 +%global baserelease 2 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -501,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 44.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jan 12 2025 Mamoru TASAKA - 44.2-1 - Update to 44.2 From 1c82df6d52e719ea7fe3bbe36b8dd11b1ece9f3a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 31 Jan 2025 10:45:43 +0900 Subject: [PATCH 119/132] Use tk8 explicitly --- ngspice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index c4d197c..2279be4 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 2 +%global baserelease 3 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -141,7 +141,7 @@ It can be used for VLSI simulations as well. %package -n tclspice Summary: Tcl/Tk interface for ngspice -BuildRequires: tk-devel +BuildRequires: pkgconfig(tk) <= 8.999 BuildRequires: blt-devel %description -n tclspice @@ -501,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Fri Jan 31 2025 Mamoru TASAKA - 44.2-3 +- Use tk8 explicitly + * Fri Jan 17 2025 Fedora Release Engineering - 44.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0e77794acae1165ada34b3e90300795e172e7091 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 28 May 2024 23:35:14 -0400 Subject: [PATCH 120/132] Fix flatpak build Installation path macros cannot be used to specify dependency locations. Tcl is part of the runtime and is in /usr even when building flatpaks for /app. BLT is not built for flatpaks (only tclspice needs it), and therefore the buildroot /usr version is used. --- ngspice.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 2279be4..a5e56b6 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -222,7 +222,7 @@ for nonUTF8 in \ ChangeLog \ %{nil} do - %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv + iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv %{__mv} -f $nonUTF8.conv $nonUTF8 done git commit -m "Change files to UTF8" -a @@ -286,7 +286,7 @@ cd %{name} # ---- Tclspice ---------------------------------------------------------------- # Adding BLT support -export CFLAGS="%{optflags} -I%{_includedir}/blt" +export CFLAGS="%{optflags} -I$(pkg-config --variable=includedir tcl)/blt" # Make builddir for tclspice %{__mkdir} -p tclspice @@ -326,7 +326,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --enable-predictor \ --enable-shared \ --with-readline=yes \ - --with-tcl=%{_libdir}/ \ + --with-tcl=$(pkg-config --variable=libdir tcl) \ --libdir=%{_libdir}/tclspice \ %{nil} From c483836b6d5049ba34e7b5ea5d49fc570753f107 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:50:19 +0000 Subject: [PATCH 121/132] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ngspice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngspice.spec b/ngspice.spec index a5e56b6..3aa7739 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -19,7 +19,7 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 3 +%global baserelease 4 %if 0%{?usegitbare} >= 1 # pre-master-42 @@ -501,6 +501,9 @@ popd %{_includedir}/ngspice/ %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 44.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 31 2025 Mamoru TASAKA - 44.2-3 - Use tk8 explicitly From 68df1ef9f25a38ef73780488e243146df2a81e90 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 25 Jul 2025 17:22:00 +0900 Subject: [PATCH 122/132] update to the latest git --- ngspice.spec | 18 +++++++++--------- sources | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index a5e56b6..228a891 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,8 +5,8 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 1 -%global usegitbare 0 +%global userelease 0 +%global usegitbare 1 %if 0%{?usegitbare} < 1 # force @@ -19,16 +19,16 @@ %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') -%global baserelease 3 +%global baserelease 1 %if 0%{?usegitbare} >= 1 -# pre-master-42 -%global gitcommit c87df54f24969de0c9d503c349258d9953ae208a -%global gitdate 20231111 +# pre-master-45 +%global gitcommit 35898d186da7d303704a55ad4096b47fd658dd5c +%global gitdate 20250723 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20231112 -%global tarballtime 1636 +%global tarballdate 20250724 +%global tarballtime 2037 %endif %if 0%{?userelease} >= 1 @@ -38,7 +38,7 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %global flagrel %{nil} %if 0%{?use_gcc_strict_sanitize} >= 1 diff --git a/sources b/sources index 2000db3..41649ee 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ngspice-44.2.tar.gz) = b6cccf38d460f9aace5379db3b75c247b3aed04b902a2355e27b4ee3a64206b0ac8828c8685da3bf8e57c0746c10f39418849a4f31563e9f5ff7c05de0eb3ae2 -SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b +SHA512 (ngspice-20250724T2037.tar.gz) = 2a24a01d5cc00cfa06abc61fcbfce536df53632d67bd61e331d132e2e5ae2c9f80f9d341107fd48e1fa62d5e7453c100bad001cc17282970a5682aa7513d05c6 From 460429b7d76be0fe2687fc5a92c53f4b1c575efd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 25 Jul 2025 18:05:04 +0900 Subject: [PATCH 123/132] again add pdf to source --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 41649ee..2b8c4a6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (ngspice-20250724T2037.tar.gz) = 2a24a01d5cc00cfa06abc61fcbfce536df53632d67bd61e331d132e2e5ae2c9f80f9d341107fd48e1fa62d5e7453c100bad001cc17282970a5682aa7513d05c6 +SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From cdb9c3a5f2f78cf27d65be5f238bf6c3af446258 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 1 Aug 2025 17:07:59 +0900 Subject: [PATCH 124/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 228a891..2cb04e8 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit 35898d186da7d303704a55ad4096b47fd658dd5c -%global gitdate 20250723 +%global gitcommit b5ac0118b4c934cc31a6b7aacfa31b09253652a7 +%global gitdate 20250730 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250724 -%global tarballtime 2037 +%global tarballdate 20250801 +%global tarballtime 1658 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 2b8c4a6..af6b1a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250724T2037.tar.gz) = 2a24a01d5cc00cfa06abc61fcbfce536df53632d67bd61e331d132e2e5ae2c9f80f9d341107fd48e1fa62d5e7453c100bad001cc17282970a5682aa7513d05c6 +SHA512 (ngspice-20250801T1658.tar.gz) = 2b32f6e1b453c206114645942ee8e4a387929a51be351bf78b2722c361faaf3acd62c7e38190a6a4694fbee81108d6f7cad17baa903dd3bc148ae0415a1f9b3a SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 27044e6b403efa7ed5f8b599f33a6f8fdd0dea45 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Aug 2025 16:48:47 +0900 Subject: [PATCH 125/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 2cb04e8..a749fae 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit b5ac0118b4c934cc31a6b7aacfa31b09253652a7 -%global gitdate 20250730 +%global gitcommit e5e46c8782aaeaf80c8c3c9b9eb3a063c35461d5 +%global gitdate 20250803 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250801 -%global tarballtime 1658 +%global tarballdate 20250805 +%global tarballtime 1520 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index af6b1a8..104a48b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250801T1658.tar.gz) = 2b32f6e1b453c206114645942ee8e4a387929a51be351bf78b2722c361faaf3acd62c7e38190a6a4694fbee81108d6f7cad17baa903dd3bc148ae0415a1f9b3a +SHA512 (ngspice-20250805T1520.tar.gz) = 2fc1f65b86ed7ee74841c47a4b3c01a1425f34541b7dc7424e90512febdf293a9e0020df6792ad608c61859d6f1f5e869c1eaf1fa306169cecf065577a823c95 SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From fdc6a110fd46058a155512a15af3e9eed25cdbdb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Aug 2025 22:20:00 +0900 Subject: [PATCH 126/132] enable parallel make --- ngspice.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index a749fae..e4b0063 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -330,7 +330,7 @@ export CPPFLAGS=-DUSE_INTERP_RESULT --libdir=%{_libdir}/tclspice \ %{nil} -%{__make} -k +%make_build -k # Once install to the temp dir rm -rf $(pwd)/../INST-TCLSPICE %{__make} INSTALL="install -p" install DESTDIR=$(pwd)/../INST-TCLSPICE @@ -372,8 +372,7 @@ do %{nil} %{__make} clean -# No parallel make -%{__make} -k +%make_build -k # Once install to the temp dir rm -rf $(pwd)/INST-NGSPICE-${opt} %{__make} INSTALL="install -p" install DESTDIR=$(pwd)/INST-NGSPICE-${opt} From 4db0e42cc195171c9b798d21e18044e292a31312 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 11 Aug 2025 23:23:35 +0900 Subject: [PATCH 127/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index e4b0063..57da658 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit e5e46c8782aaeaf80c8c3c9b9eb3a063c35461d5 -%global gitdate 20250803 +%global gitcommit b44421749abfa61c5df87094d2479b1b90ebed91 +%global gitdate 20250805 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250805 -%global tarballtime 1520 +%global tarballdate 20250811 +%global tarballtime 2318 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index 104a48b..c4a2794 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250805T1520.tar.gz) = 2fc1f65b86ed7ee74841c47a4b3c01a1425f34541b7dc7424e90512febdf293a9e0020df6792ad608c61859d6f1f5e869c1eaf1fa306169cecf065577a823c95 +SHA512 (ngspice-20250811T2318.tar.gz) = 521392e8f456f06b454a7974ee19870cd605510b3581896a8f9eb74e8f1b7c3058b4f6d4b99d2339cc1735059ce0750e209820aefbcd8ed508e89bf8c07da916 SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 2d31bd5d93fd2d21f6956cddfbf26c85eb9ceaf2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 14 Aug 2025 18:25:08 +0900 Subject: [PATCH 128/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 57da658..c2aa360 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit b44421749abfa61c5df87094d2479b1b90ebed91 -%global gitdate 20250805 +%global gitcommit e6427cedc2738bed22480f069f96cd05a710ceb7 +%global gitdate 20250813 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250811 -%global tarballtime 2318 +%global tarballdate 20250814 +%global tarballtime 1813 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index c4a2794..fdaf7cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250811T2318.tar.gz) = 521392e8f456f06b454a7974ee19870cd605510b3581896a8f9eb74e8f1b7c3058b4f6d4b99d2339cc1735059ce0750e209820aefbcd8ed508e89bf8c07da916 +SHA512 (ngspice-20250814T1813.tar.gz) = 9491671bf001d63922d4c99b73cec700570aaf105da9df36c19212ee9f5ab5f230c0a3c2af364efe0ba02eaffd2ef5012189bbaa6d7a16ab405d2d2a2363127c SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 956e54007c28204666a3011111452b70e5aa4115 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Aug 2025 15:47:43 +0900 Subject: [PATCH 129/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index c2aa360..355689f 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit e6427cedc2738bed22480f069f96cd05a710ceb7 -%global gitdate 20250813 +%global gitcommit 5139cbb36c4a6884b9c41ef0dfb1f761bda88009 +%global gitdate 20250818 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250814 -%global tarballtime 1813 +%global tarballdate 20250824 +%global tarballtime 1539 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index fdaf7cf..eb7cd82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250814T1813.tar.gz) = 9491671bf001d63922d4c99b73cec700570aaf105da9df36c19212ee9f5ab5f230c0a3c2af364efe0ba02eaffd2ef5012189bbaa6d7a16ab405d2d2a2363127c +SHA512 (ngspice-20250824T1539.tar.gz) = 1cba17a6b4eea30a03ed36c617779be9c2da14bdd99149036118b1d8b0ec4bb899b8f082c6e6b9a659e507564e28e89db465992aa757df94f578877f4d1109af SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From ca6de1b4cee738ad93c389f9ed2f094602bbfe80 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 31 Aug 2025 22:26:09 +0900 Subject: [PATCH 130/132] update to the latest git --- ngspice.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 355689f..ff7b347 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -23,12 +23,12 @@ %if 0%{?usegitbare} >= 1 # pre-master-45 -%global gitcommit 5139cbb36c4a6884b9c41ef0dfb1f761bda88009 -%global gitdate 20250818 +%global gitcommit 1d0beb5e266420b1dd756913356a295ddb60fdce +%global gitdate 20250830 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20250824 -%global tarballtime 1539 +%global tarballdate 20250831 +%global tarballtime 2034 %endif %if 0%{?userelease} >= 1 diff --git a/sources b/sources index eb7cd82..9a320fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250824T1539.tar.gz) = 1cba17a6b4eea30a03ed36c617779be9c2da14bdd99149036118b1d8b0ec4bb899b8f082c6e6b9a659e507564e28e89db465992aa757df94f578877f4d1109af +SHA512 (ngspice-20250831T2034.tar.gz) = accb8f04603b7b3a1022b424ffa147716c9e63f4ed42079d03f7ab8c04dc59ea2f335084e055314a9d2be138fa04cb8e334c18f1bee62c18e1f355f74e0ea1ab SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b From 9ba8a88ec405a8372a21ba950c0dd747638fe1c7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Sep 2025 17:31:37 +0900 Subject: [PATCH 131/132] Update to 45 --- ngspice.spec | 15 +++++++++------ sources | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index ff7b347..b9db830 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -5,17 +5,17 @@ # - Provides tclspice capabilities # Chitlesh Goorah -%global userelease 0 -%global usegitbare 1 +%global userelease 1 +%global usegitbare 0 %if 0%{?usegitbare} < 1 # force %global userelease 1 %endif -%global majorver 44 -%global minorver 2 -%global docver 44 +%global majorver 45 +%dnl %global minorver 2 +%global docver 45 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -38,7 +38,7 @@ %global fedoraver %{majorver}%{?minorver:.%minorver}^%{gitdate}git%{shortcommit} %endif -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global flagrel %{nil} %if 0%{?use_gcc_strict_sanitize} >= 1 @@ -500,6 +500,9 @@ popd %{_includedir}/ngspice/ %changelog +* Tue Sep 02 2025 Mamoru TASAKA - 45-1 +- Update to 45 + * Fri Jan 31 2025 Mamoru TASAKA - 44.2-3 - Use tk8 explicitly diff --git a/sources b/sources index 9a320fd..4f86b89 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-20250831T2034.tar.gz) = accb8f04603b7b3a1022b424ffa147716c9e63f4ed42079d03f7ab8c04dc59ea2f335084e055314a9d2be138fa04cb8e334c18f1bee62c18e1f355f74e0ea1ab -SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b +SHA512 (ngspice-45.tar.gz) = a23f41e84d6662aeb33e025693ebf5d77fc430ef39a9c8221fabb825b9163a48815edc5de7aa22ec7a0222d00ba34da1e827a2ba74e88329df6d0bb192a57d17 +SHA512 (ngspice-45-manual.pdf) = 425d9320a01d409c7baab83d111f92643cae7df62a109e06d7e4fd366262441f4fdd62532db63fb4d4af4cb98e478b4f9fca5bd6c63fb89507dba685220f34ab From 604180f0307648b466128412eb5b13e35aadd280 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 7 Sep 2025 22:51:06 +0900 Subject: [PATCH 132/132] 45.2 --- ngspice.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ngspice.spec b/ngspice.spec index 54d1298..61b80f7 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -14,7 +14,7 @@ %endif %global majorver 45 -%dnl %global minorver 2 +%global minorver 2 %global docver 45 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -500,6 +500,9 @@ popd %{_includedir}/ngspice/ %changelog +* Sun Sep 07 2025 Mamoru TASAKA - 45.2-1 +- Update to 45.2 + * Tue Sep 02 2025 Mamoru TASAKA - 45-1 - Update to 45 diff --git a/sources b/sources index 4f86b89..a6f3db9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-45.tar.gz) = a23f41e84d6662aeb33e025693ebf5d77fc430ef39a9c8221fabb825b9163a48815edc5de7aa22ec7a0222d00ba34da1e827a2ba74e88329df6d0bb192a57d17 +SHA512 (ngspice-45.2.tar.gz) = 4090e9433457c0b49dc1e7561bc630a5c6a340391f26be8142c6bd514ae13b72137589964fe9ae5a01069c9de7d8457bd41b0811a335b2c93a3c6e07044b35b1 SHA512 (ngspice-45-manual.pdf) = 425d9320a01d409c7baab83d111f92643cae7df62a109e06d7e4fd366262441f4fdd62532db63fb4d4af4cb98e478b4f9fca5bd6c63fb89507dba685220f34ab