[packages/arpack-ng] - switched to cmake to restore cmake config files in -devel

qboosh qboosh at pld-linux.org
Sat Sep 2 14:07:08 CEST 2023


commit a51c54e9b81e02cdab70ac6ec3bc4f86d605148b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 2 13:15:46 2023 +0200

    - switched to cmake to restore cmake config files in -devel

 arpack-ng.spec | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)
---
diff --git a/arpack-ng.spec b/arpack-ng.spec
index 20b97fb..4227df5 100644
--- a/arpack-ng.spec
+++ b/arpack-ng.spec
@@ -14,13 +14,11 @@ Group:		Libraries
 Source0:	https://github.com/opencollab/arpack-ng/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	e28fdbe33ee44a16e2733c180ec2a2bd
 URL:		https://github.com/opencollab/arpack-ng
-BuildRequires:	autoconf >= 2.67
-BuildRequires:	automake
 BuildRequires:	blas-devel
+BuildRequires:	cmake >= 3.0
 BuildRequires:	gcc-g77
 BuildRequires:	lapack-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool	>= 2:2.4.2
 BuildRequires:	pkgconfig
 Provides:	arpack = %{version}-%{release}
 Obsoletes:	arpack < 3
@@ -53,6 +51,7 @@ Summary(pl.UTF-8):	Pliki programistyczne ARPACK
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	blas-devel
+Requires:	lapack-devel
 Provides:	arpack-devel = %{version}-%{release}
 Obsoletes:	arpack-devel < 3
 
@@ -80,24 +79,36 @@ Statyczna biblioteka ARPACK.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__automake}
-%configure \
-	--enable-icb \
-	%{?with_static_libs:--enable-static}
-
+%if %{with static_libs}
+install -d build-static
+cd build-static
+%cmake .. \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DCMAKE_INSTALL_INCLUDEDIR=include \
+	-DICB=ON
+%{__make}
+cd ..
+%endif
+install -d build
+cd build
+%cmake .. \
+	-DICB=ON
 %{__make}
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%if %{with static_libs}
+%{__make} -C build-static install \
+	DESTDIR=$RPM_BUILD_ROOT
+%endif
+
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libarpack.la
+# not installed by cmake
+cp -p build/{arpackSolver,parpack}.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/arpack.pc
 %{_pkgconfigdir}/arpackSolver.pc
 %{_pkgconfigdir}/parpack.pc
-#%{_libdir}/cmake/arpack-ng
+%{_libdir}/cmake/arpackng
 
 %if %{with static_libs}
 %files static
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/arpack-ng.git/commitdiff/a51c54e9b81e02cdab70ac6ec3bc4f86d605148b



More information about the pld-cvs-commit mailing list