The package rpms/ngspice.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ngspice.git/commit/?id=43fa62d918....
Change:
-%ifarch x86_64 sparc64 ppc64 amd64
Thanks.
Full change:
============
commit cd4963627aae9ca56ace98712d470ade3ca9b0cc
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Wed May 6 10:39:10 2020 +0900
fix source entry
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/%{versi...
+Source1:
https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{versi...
Source2:
https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{versi...
Source10: create-ngspice-git-bare-tarball.sh
commit e3cd1b234b9508cdc474a4c0b713ecad16a56ab3
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Wed May 6 10:33:53 2020 +0900
32.2 tagged
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 <mtasaka(a)fedoraproject.org> -
32-1.D20200405gitbbe81ca
+* Wed May 6 2020 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 32.2-1
+- 32.2 tagged
+
+* Tue May 5 2020 Mamoru TASAKA <mtasaka(a)fedoraproject.org> -
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
commit 43fa62d918fa0a8eda1824c821699b8fa7fc2d41
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Wed May 6 01:44:10 2020 +0900
Update to 32
Use upstream git to use some upstream fixes since release
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
+
+%if 0%{?usegitbare} < 1
+# force
+%global userelease 1
+%endif
+
+%global mainver 32
+%undefine prever
+%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
-# Toggle the following declaration when using version controlled snapshots
-%global devel 0
+%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/%{versi...
+%endif
+%if 0%{?usegitbare} >= 1
+Source0: ngspice-%{tarballdate}T%{tarballtime}.tar.gz
+%endif
Source1:
https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{versi...
Source2:
https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/%{versi...
-%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(a)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(a)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 <mtasaka(a)fedoraproject.org> -
32-1.D20200405gitbbe81ca
+- Update to 32
+- Use upstream git to use some upstream fixes since release
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
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
commit 3927f163bf8f51479a0b8312340928b3507d07df
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 29 14:59:13 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
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 <releng(a)fedoraproject.org> -
31-4.respin2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Mon Oct 7 2019 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 31-3.respin2
- 31 tarball again respun