diff --git a/.gitignore b/.gitignore index 24653c3..a29b03e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ ngspice-rework-20.cvs20100719.tar.bz2 /ngspice23-manual.pdf /ngspice-26.tar.gz /ngspice-26-manual.pdf +/ngspice-27.tar.gz +/ngspice-27-manual.pdf diff --git a/ngspice.spec b/ngspice.spec index 22da087..389999a 100644 --- a/ngspice.spec +++ b/ngspice.spec @@ -16,11 +16,11 @@ %global devel 0 Name: ngspice -Version: 26 +Version: 27 %if %{?devel} %global snap .20111129cvs %endif -Release: 10%{?snap}%{?dist} +Release: 1%{?snap}%{?dist} Summary: A mixed level/signal circuit simulator License: BSD @@ -213,11 +213,17 @@ export CPPFLAGS=-DUSE_INTERP_RESULT %{nil} %{__make} +# Once install to the temp dir +rm -rf $(pwd)/../INST-TCLSPICE +%{__make} INSTALL="install -p" install DESTDIR=$(pwd)/../INST-TCLSPICE cd .. # ------------------------------------------------------------------------------ +for opt in with-ngshared without-ngshared +do %configure \ --disable-silent-rules \ + --${opt} \ --disable-xgraph \ --enable-adms \ --enable-xspice \ @@ -240,27 +246,21 @@ cd .. --libdir=%{_libdir} \ %{nil} +%{__make} clean %{__make} # %{?_smp_mflags} +# Once install to the temp dir +rm -rf $(pwd)/INST-NGSPICE-${opt} +%{__make} INSTALL="install -p" install DESTDIR=$(pwd)/INST-NGSPICE-${opt} + +done %install %if %{?devel} cd ng-spice-rework %endif -# Once install to the temp dir -rm -rf $(pwd)/INST-NGSPICE -%{__make} INSTALL="install -p" install DESTDIR=$(pwd)/INST-NGSPICE - - - # ---- Tclspice ---------------------------------------------------------------- -# Tclspice : Make install -cd tclspice -# Once install to the temp dir -rm -rf $(pwd)/INST-TCLSPICE -%{__make} INSTALL="install -p" install DESTDIR=$(pwd)/../INST-TCLSPICE -cd .. # Clean up unneeded / duplicate files also installed from ngspice pushd INST-TCLSPICE @@ -272,9 +272,11 @@ mv .%{_bindir}/cmpp{,-tclspice} popd # Install -cp -a INST-NGSPICE/* %{buildroot} +cp -a INST-NGSPICE-without-ngshared/* %{buildroot} cp -a INST-TCLSPICE/* %{buildroot} +# For now, remove include files +rm -rf %{buildroot}%{_includedir} %{__rm} -rf \ %{buildroot}%{_libdir}/tclspice/libspice.la \ %{buildroot}%{_libdir}/tclspice/libspicelite.la \ @@ -344,6 +346,9 @@ cd tests %{_datadir}/%{name}/scripts/tclspinit %changelog +* Fri Sep 22 2017 Mamoru TASAKA - 27-1 +- Update to 27 + * Thu Aug 03 2017 Fedora Release Engineering - 26-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 79ec6b4..d58e0ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7fd9cdd11b1bb109eb48201222de4c50 ngspice-26.tar.gz -70f83f5741405ffd979af1c4a5b6ba79 ngspice-26-manual.pdf +SHA512 (ngspice-27.tar.gz) = 1714f95ab5716c228a0b39395a742e8b9a823e0e6f7e08625d089541ea786df5fd7b9d2982bcec8431e27ac6ba7603ecc507f9cfcb0a6aacd53f5633f52bd2ea +SHA512 (ngspice-27-manual.pdf) = ed87764715917e2cd832c49e911a2908dba9907f9f01c933cb7f97a92c7f9ff345bc26a2f0561dd34b2eede6874b6a67b4864abf3dcff127bd0306e778e997b5