[packages/belcard] - cleanup, updated dependencies, require belr built with cmake

qboosh qboosh at pld-linux.org
Thu Jun 17 16:49:09 CEST 2021


commit f826c37eb3a9f67bd3113391f18134ee698bb999
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jun 17 16:51:54 2021 +0200

    - cleanup, updated dependencies, require belr built with cmake

 belcard.spec | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/belcard.spec b/belcard.spec
index a4c37d8..0759e6e 100644
--- a/belcard.spec
+++ b/belcard.spec
@@ -14,16 +14,15 @@ Source0:	https://gitlab.linphone.org/BC/public/belcard/-/archive/%{version}/%{na
 # Source0-md5:	6c0ebca77e42cc8591bc2c895458e3ef
 Patch0:		%{name}-static.patch
 URL:		https://linphone.org/
-BuildRequires:	autoconf >= 2.63
-BuildRequires:	automake
 BuildRequires:	bctoolbox-devel >= 0.0.3
 BuildRequires:	bcunit-devel
-BuildRequires:	belr-devel
+BuildRequires:	belr-devel >= 4.5.0
+BuildRequires:	cmake >= 3.1
 BuildRequires:	libstdc++-devel >= 6:4.7
-BuildRequires:	libtool >= 2:2
 BuildRequires:	pkgconfig
 BuildRequires:	xxd
 Requires:	bctoolbox >= 0.0.3
+Requires:	belr >= 4.5.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,7 +37,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki BelCard
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	bctoolbox-devel >= 0.0.3
-Requires:	belr-devel
+Requires:	belr-devel >= 4.5.0
 Requires:	libstdc++-devel >= 6:4.7
 
 %description devel
@@ -66,20 +65,10 @@ Statyczna biblioteka BelCard.
 %build
 install -d build
 cd build
-%cmake ..
+%cmake .. \
+	%{!?with_static_libs:-DENABLE_STATIC=OFF}
 
 %{__make}
-%if 0
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	%{?with_static_libs:--enable-static}
-%{__make}
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,9 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# obsoleted by pkg-config
-#%{__rm} $RPM_BUILD_ROOT%{_libdir}/libbelcard.la
-
 # disable completeness check incompatible with split packaging
 %{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d; /^unset(_IMPORT_CHECK_TARGETS)/d' $RPM_BUILD_ROOT%{_datadir}/belcard/cmake/belcardTargets.cmake
 
@@ -103,6 +89,7 @@ install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 	-e 's, at LIBS_PRIVATE@,-lbelr -lbctoolbox,' \
 	-e 's, at CMAKE_INSTALL_FULL_INCLUDEDIR@,%{_includedir},' \
 	belcard.pc.in >$RPM_BUILD_ROOT%{_pkgconfigdir}/belcard.pc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/belcard.git/commitdiff/f826c37eb3a9f67bd3113391f18134ee698bb999



More information about the pld-cvs-commit mailing list