[packages/ngspice] - build both library and app; release 2

Mon Apr 29 19:59:54 CEST 2024

commit cf2e45e08d984209dca1adb756123b75b3b67c63
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 29 19:41:38 2024 +0200

    - build both library and app; release 2

 ngspice-am.patch |  23 +++++++++
 ngspice.spec     | 144 +++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 125 insertions(+), 42 deletions(-)
---

diff --git a/ngspice.spec b/ngspice.spec
index b70d749..c1ffeea 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -1,17 +1,36 @@
+#
 # Conditional build:
-%bcond_without	shared	# build as shared library
+%bcond_without	shared	# ngspice shared library
+%bcond_without	x11	# ngspice app
 
 Summary:	Ngspice circuit simulator
-Summary(pl.UTF-8):	Ngspice symulator obwodów
+Summary(pl.UTF-8):	Symulator obwodów Ngspice
 Name:		ngspice
 Version:	42
-Release:	1
-License:	GPL
-Group:		Applications
-Source0:	https://sourceforge.net/projects/ngspice/files/ng-spice-rework/%{version}/%{name}-%{version}.tar.gz
+Release:	2
+License:	Modified BSD, MPL v2.0, LGPL v2+, GPL v2+
+Group:		Applications/Engineering
+Source0:	https://downloads.sourceforge.net/ngspice/%{name}-%{version}.tar.gz
 # Source0-md5:	84ab9e67127f9732639195dd63b98a5e
 Source1:	%{name}.desktop
-URL:		http://ngspice.sourceforge.net/
+Patch0:		%{name}-am.patch
+URL:		https://ngspice.sourceforge.net/
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake
+BuildRequires:	fftw3-devel >= 3
+BuildRequires:	libgomp-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:2
+%if %{with x11}
+BuildRequires:	fontconfig-devel
+BuildRequires:	ncurses-devel
+BuildRequires:	readline-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXt-devel
+%endif
+Requires:	%{name}-common = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,16 +39,41 @@ based on three open source software packages: Spice3f5, Cider1b1 and
 Xspice.
 
 %description -l pl.UTF-8
-Ngspice is a mixed-level/mixed-signal circuit simulator. Its code is
-based on three open source software packages: Spice3f5, Cider1b1 and
-Xspice.
+Ngspice to symulator obwodów różnych poziomów/sygnałów. Kod jest
+oparty na trzech projektach o otwartych źródłach: Spice3f5, Cider1b1
+oraz Xspice.
+
+%package common
+Summary:	Common data and modules for ngspice engine
+Summary(pl.UTF-8):	Wspólne dane i moduły dla silnika ngspice
+Group:		Libraries
+Conflicts:	ngspice < 42-2
+
+%description common
+Common data and modules for ngspice engine (either application or
+library).
+
+%description common -l pl.UTF-8
+Wspólne dane i moduły dla silnika ngspice (zarówno w postaci
+aplikacji, jak i biblioteki).
+
+%package libs
+Summary:	Shared nspice library
+Summary(pl.UTF-8):	Biblioteka współczielona ngspice
+Group:		Libraries
+Requires:	%{name}-data = %{version}-%{release}
+
+%description libs
+Shared nspice library.
+
+%description libs -l pl.UTF-8
+Biblioteka współczielona ngspice.
 
 %package devel
 Summary:	Header files for ngspice library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki ngspice
-License:	GPL
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for ngspice library.
@@ -39,69 +83,85 @@ Pliki nagłówkowe biblioteki ngspice.
 
 %prep
 %setup -q
+%patch0 -p1
+
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
-
-%configure \
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+for kind in %{?with_shared:ngshared} %{?with_x11:x} ; do
+install -d build-${kind}
+cd build-${kind}
+../%configure \
 	--disable-silent-rules \
-	--enable-xspice \
 	--enable-cider \
 	--enable-openmp \
-%if %{with shared}
-	--with-ngshared
-%else
-	--enable-xgraph \
-	--with-x \
-	--with-readline=yes
-%endif
+	--enable-osdi \
+	--enable-xspice \
+	--with-${kind} \
+	$([ "${kind}" = "x" ] && echo --with-readline)
 
 %{__make}
+cd ..
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%if %{with x11}
+%{__make} -C build-x install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install -d $RPM_BUILD_ROOT%{_desktopdir}
-
-%if %{without shared}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 %endif
+
+%if %{with shared}
+%{__make} -C build-ngshared install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+# obsoleted by pkgconfig
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libngspice.la
+%endif
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -R examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with shared}
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
-%endif
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
+%if %{with x11}
 %files
 %defattr(644,root,root,755)
-%doc ANALYSES AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/ngspice
+%{_desktopdir}/ngspice.desktop
+%{_mandir}/man1/ngspice.1*
+%endif
+
+%files common
+%defattr(644,root,root,755)
+%doc ANALYSES AUTHORS BUGS ChangeLog DEVICES FAQ NEWS README
 %dir %{_libdir}/ngspice
 %attr(755,root,root) %{_libdir}/ngspice/*.cm
-%{_examplesdir}/%{name}-%{version}
 %{_datadir}/%{name}
+%{_examplesdir}/%{name}-%{version}
 
-%if %{without shared}
-%attr(755,root,root) %{_bindir}/ngspice
-%{_desktopdir}/%{name}.desktop
-%{_mandir}/man1/ng*1*
-%else
-%attr(755,root,root) %{_libdir}/libngspice.so.0.0.*
+%if %{with shared}
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libngspice.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libngspice.so.0
-%endif
 
 %files devel
 %defattr(644,root,root,755)
-%if %{with shared}
 %{_libdir}/libngspice.so
-%{_libdir}/libngspice.la
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/ngspice.pc
 %{_includedir}/ngspice
 %endif
diff --git a/ngspice-am.patch b/ngspice-am.patch
new file mode 100644
index 0000000..314db62
--- /dev/null
+++ b/ngspice-am.patch
@@ -0,0 +1,23 @@
+Fix libtool versioning breakage (AGE cannot be empty or greater than CURRENT)
+--- ngspice-42/src/Makefile.am.orig	2023-12-27 19:58:03.000000000 +0100
++++ ngspice-42/src/Makefile.am	2024-04-29 17:58:42.215876756 +0200
+@@ -650,7 +650,7 @@ endif
+ 
+ ## if !SHWIN
+ ## if !SHCYG
+-libngspice_la_LDFLAGS += -version-info $(LT_NGSPICE_CURRENT):$(LT_NGSPICE_REVISION):$(LT_LIBNGSPICE_AGE)
++libngspice_la_LDFLAGS += -version-info $(LT_NGSPICE_CURRENT):$(LT_NGSPICE_REVISION):$(LT_NGSPICE_AGE)
+ ## endif
+ ## endif
+ 
+--- ngspice-42/configure.ac.orig	2023-12-27 19:58:03.000000000 +0100
++++ ngspice-42/configure.ac	2024-04-29 18:16:49.605754536 +0200
+@@ -118,7 +118,7 @@ LT_INIT([shared static])
+ 
+ LT_NGSPICE_CURRENT=0
+ LT_NGSPICE_REVISION=9
+-LT_NGSPICE_AGE=2
++LT_NGSPICE_AGE=0
+ LIBNGSPICE_SO_VERSION=$LT_NGSPICE_CURRENT.$LT_NGSPICE_REVISION.$LT_NGSPICE_AGE
+ 
+ # Announce the libtool version
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ngspice.git/commitdiff/cf2e45e08d984209dca1adb756123b75b3b67c63

