[packages/belcard] - updated to 5.3.29

[qboosh]

commit db6566943084c442992bddd61a230f1853f71812
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 10 10:03:02 2024 +0100

    - updated to 5.3.29

 belcard-static.patch | 22 ---------------------
 belcard.spec         | 56 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 47 deletions(-)
---
diff --git a/belcard.spec b/belcard.spec
index 05df7a9..b16fec5 100644
--- a/belcard.spec
+++ b/belcard.spec
@@ -5,25 +5,24 @@
 Summary:	Belledonne Communications' vCard 4 parsing library
 Summary(pl.UTF-8):	Biblioteka Belledonne Communications do analizy formatu vCard 4
 Name:		belcard
-Version:	5.2.51
+Version:	5.3.29
 Release:	1
 License:	GPL v3+
 Group:		Libraries
 #Source0Download: https://gitlab.linphone.org/BC/public/belcard/-/tags
 Source0:	https://gitlab.linphone.org/BC/public/belcard/-/archive/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	0cd0087d72ac00e4b8a669344216823f
-Patch0:		%{name}-static.patch
+# Source0-md5:	1e05ff8d67569ef4a6c132239d3732d5
 URL:		https://linphone.org/
-BuildRequires:	bctoolbox-devel >= 0.0.3
+BuildRequires:	bctoolbox-devel >= 5.3.0
 BuildRequires:	bcunit-devel
-BuildRequires:	belr-devel >= 5
-BuildRequires:	cmake >= 3.1
-BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	belr-devel >= 5.3.0
+BuildRequires:	cmake >= 3.22
+BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRequires:	xxd
-Requires:	bctoolbox >= 0.0.3
-Requires:	belr >= 5
+Requires:	bctoolbox >= 5.3.0
+Requires:	belr >= 5.3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,9 +36,9 @@ Summary:	Header files for BelCard library
 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 >= 5
-Requires:	libstdc++-devel >= 6:4.7
+Requires:	bctoolbox-devel >= 5.3.0
+Requires:	belr-devel >= 5.3.0
+Requires:	libstdc++-devel >= 6:7
 
 %description devel
 Header files for BelCard library.
@@ -61,24 +60,31 @@ Statyczna biblioteka BelCard.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-install -d builddir
-cd builddir
-%cmake .. \
-	%{!?with_static_libs:-DENABLE_STATIC=OFF}
+%if %{with static_libs}
+%cmake -B builddir-static \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DENABLE_UNIT_TESTS=OFF \
+	-DENABLE_TOOLS=OFF
+
+%{__make} -C builddir-static
+%endif
 
-%{__make}
+%cmake -B builddir
+
+%{__make} -C builddir
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C builddir install \
+%if %{with static_libs}
+%{__make} -C builddir-static install \
 	DESTDIR=$RPM_BUILD_ROOT
+%endif
 
-# 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
+%{__make} -C builddir install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 # missing from cmake
 test ! -f $RPM_BUILD_ROOT%{_pkgconfigdir}/belcard.pc
@@ -103,9 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/belcard-folder
 %attr(755,root,root) %{_bindir}/belcard-parser
 %attr(755,root,root) %{_bindir}/belcard-unfolder
-%attr(755,root,root) %{_bindir}/belcard_tester
+%attr(755,root,root) %{_bindir}/belcard-tester
 %attr(755,root,root) %{_libdir}/libbelcard.so.1
-%{_datadir}/belcard_tester
+%{_datadir}/belcard-tester
 %{_datadir}/belr/grammars/vcard_grammar
 
 %files devel
@@ -113,8 +119,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libbelcard.so
 %{_includedir}/belcard
 %{_pkgconfigdir}/belcard.pc
-%dir %{_datadir}/belcard
-%{_datadir}/belcard/cmake
+%dir %{_datadir}/BelCard
+%{_datadir}/BelCard/cmake
 
 %if %{with static_libs}
 %files static
diff --git a/belcard-static.patch b/belcard-static.patch
deleted file mode 100644
index 69a9caa..0000000
--- a/belcard-static.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- belcard-4.5.20/src/CMakeLists.txt.orig	2020-08-21 12:49:06.000000000 +0200
-+++ belcard-4.5.20/src/CMakeLists.txt	2021-06-16 22:35:51.248231597 +0200
-@@ -49,9 +49,16 @@
- bc_apply_compile_flags(BELCARD_SOURCE_FILES_CXX STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX)
- 
- if(ENABLE_STATIC)
--	add_library(belcard STATIC ${BELCARD_HEADER_FILES} ${BELCARD_SOURCE_FILES_C} ${BELCARD_SOURCE_FILES_CXX})
--	set_target_properties(belcard PROPERTIES OUTPUT_NAME belcard)
--	target_link_libraries(belcard PRIVATE belr bctoolbox)
-+	add_library(belcard-static STATIC ${BELCARD_HEADER_FILES} ${BELCARD_SOURCE_FILES_C} ${BELCARD_SOURCE_FILES_CXX})
-+	set_target_properties(belcard-static PROPERTIES OUTPUT_NAME belcard)
-+	target_link_libraries(belcard-static PRIVATE belr bctoolbox)
-+install(TARGETS belcard-static EXPORT ${EXPORT_TARGETS_NAME}Targets
-+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	FRAMEWORK DESTINATION Frameworks
-+	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-+)
- endif()
- if(ENABLE_SHARED)
- 	add_library(belcard SHARED ${BELCARD_HEADER_FILES} ${BELCARD_SOURCE_FILES_C} ${BELCARD_SOURCE_FILES_CXX} ${VCARD_GRAMMAR_FILES})
================================================================

---- gitweb:

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