diff --git a/ngspice.spec b/ngspice.spec index b65e603..61b80f7 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -13,22 +13,22 @@ %global userelease 1 %endif -%global majorver 44 +%global majorver 45 %global minorver 2 -%global docver 44 +%global docver 45 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %global baserelease 1 %if 0%{?usegitbare} >= 1 -# pre-master-42 -%global gitcommit c87df54f24969de0c9d503c349258d9953ae208a -%global gitdate 20231111 +# pre-master-45 +%global gitcommit 1d0beb5e266420b1dd756913356a295ddb60fdce +%global gitdate 20250830 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20231112 -%global tarballtime 1636 +%global tarballdate 20250831 +%global tarballtime 2034 %endif %if 0%{?userelease} >= 1 @@ -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 @@ -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,11 +326,11 @@ 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} -%{__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} @@ -501,6 +500,21 @@ 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 + +* 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 + +* 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 diff --git a/sources b/sources index 2000db3..a6f3db9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ngspice-44.2.tar.gz) = b6cccf38d460f9aace5379db3b75c247b3aed04b902a2355e27b4ee3a64206b0ac8828c8685da3bf8e57c0746c10f39418849a4f31563e9f5ff7c05de0eb3ae2 -SHA512 (ngspice-44-manual.pdf) = 544d33ef43e0856a156e3b55e1fc68559aa99d36e857d8a0036963ca26ed4c56da9fc7bf6616fae8e75bec399aa2c848872b883bf1bb671995fb82c565e3ff8b +SHA512 (ngspice-45.2.tar.gz) = 4090e9433457c0b49dc1e7561bc630a5c6a340391f26be8142c6bd514ae13b72137589964fe9ae5a01069c9de7d8457bd41b0811a335b2c93a3c6e07044b35b1 +SHA512 (ngspice-45-manual.pdf) = 425d9320a01d409c7baab83d111f92643cae7df62a109e06d7e4fd366262441f4fdd62532db63fb4d4af4cb98e478b4f9fca5bd6c63fb89507dba685220f34ab