- updated to 5.3.26

diff --git a/bzrtp-static.patch b/bzrtp-static.patch
deleted file mode 100644 (file)
index 305c469..0000000
--- a/bzrtp-static.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- bzrtp-5.2.49/src/CMakeLists.txt.orig       2023-04-09 20:47:59.297007234 +0200
-+++ bzrtp-5.2.49/src/CMakeLists.txt    2023-04-09 20:50:27.739536385 +0200
-@@ -54,16 +54,16 @@ if(XML2_FOUND)
- endif()
- 
- if(ENABLE_STATIC)
--      add_library(bzrtp STATIC ${BZRTP_SOURCE_FILES})
--      set_target_properties(bzrtp PROPERTIES OUTPUT_NAME bzrtp)
--      target_include_directories(bzrtp INTERFACE
-+      add_library(bzrtp-static STATIC ${BZRTP_SOURCE_FILES})
-+      set_target_properties(bzrtp-static PROPERTIES OUTPUT_NAME bzrtp)
-+      target_include_directories(bzrtp-static INTERFACE
-               $<INSTALL_INTERFACE:include>
-               PRIVATE ${INCLUDE_DIRS})
--      target_link_libraries(bzrtp PRIVATE bctoolbox ${LIBS})
-+      target_link_libraries(bzrtp-static PRIVATE bctoolbox ${LIBS})
-       if (postquantumcryptoengine_FOUND)
--              target_link_libraries(bzrtp PRIVATE postquantumcryptoengine)
-+              target_link_libraries(bzrtp-static PRIVATE postquantumcryptoengine)
-       endif()
--      install(TARGETS bzrtp EXPORT ${EXPORT_TARGETS_NAME}Targets
-+      install(TARGETS bzrtp-static EXPORT ${EXPORT_TARGETS_NAME}Targets
-               ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-               PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-       )

diff --git a/bzrtp.spec b/bzrtp.spec
index ad251df41a5ebf6bab58da0a595d4a3351b3f1fa..410e7b25daba4880163ba32d34120e9d7f2e00a0 100644 (file)
--- a/bzrtp.spec
+++ b/bzrtp.spec
@@ -5,24 +5,22 @@
 Summary:       Open source implementation of ZRTP keys exchange protocol
 Summary(pl.UTF-8):     Mająca otwarte źródła implementacja protokołu wymiany kluczy ZRTP
 Name:          bzrtp
-Version:       5.2.109
+Version:       5.3.26
 Release:       1
 License:       GPL v3+
 Group:         Libraries
 #Source0Download: https://gitlab.linphone.org/BC/public/bzrtp/tags
 Source0:       https://gitlab.linphone.org/BC/public/bzrtp/-/archive/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 0f0cc76288315f7d100c2d5b6efa38f5
-Patch0:                %{name}-static.patch
-Patch1:                %{name}-resetBzrtpContext.patch
+# Source0-md5: 22a3fd39362fce8ebf595a581bd633b6
+Patch0:                %{name}-resetBzrtpContext.patch
 URL:           http://www.linphone.org/
-BuildRequires: CUnit
-BuildRequires: bctoolbox-devel >= 4.4.0
-BuildRequires: cmake >= 3.1
-BuildRequires: libxml2-devel >= 2.0
+BuildRequires: bctoolbox-devel >= 5.3.0
+BuildRequires: cmake >= 3.22
+BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.748
 BuildRequires: sqlite3-devel >= 3.6.0
-Requires:      bctoolbox >= 4.4.0
+Requires:      bctoolbox >= 5.3.0
 Requires:      sqlite3 >= 3.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,6 +39,7 @@ Summary:      Header file for bzrtp library
 Summary(pl.UTF-8):     Plik nagłówkowy biblioteki bzrtp
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      bctoolbox-devel >= 5.3.0
 
 %description devel
 Header file for bzrtp library.
@@ -63,24 +62,29 @@ Statyczna biblioteka bzrtp.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -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
+
+%{__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}/bzrtp/cmake/bzrtpTargets.cmake
+%{__make} -C builddir install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 # missing from cmake
 test ! -f $RPM_BUILD_ROOT%{_pkgconfigdir}/libbzrtp.pc
@@ -107,8 +111,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libbzrtp.so
 %{_includedir}/bzrtp
 %{_pkgconfigdir}/libbzrtp.pc
-%dir %{_datadir}/bzrtp
-%{_datadir}/bzrtp/cmake
+%dir %{_datadir}/BZRTP
+%{_datadir}/BZRTP/cmake
 
 %if %{with static_libs}
 %files static