- updated to 5.3.26

diff --git a/bcmatroska2-link.patch b/bcmatroska2-link.patch
deleted file mode 100644 (file)
index 6b42f40..0000000
--- a/bcmatroska2-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- bcmatroska2-5.2.1/corec/corec/CMakeLists.txt.orig  2022-11-29 11:25:07.000000000 +0100
-+++ bcmatroska2-5.2.1/corec/corec/CMakeLists.txt       2023-04-09 20:33:31.565041475 +0200
-@@ -52,7 +52,6 @@ if(WIN32)
- else()
-       list(APPEND COREC_SOURCES
-               helpers/date/date_libc.c
--              helpers/file/file_libc.c
-               helpers/file/file_bctbx.c
-               multithread/multithread_pthread.c
-       )
---- bcmatroska2-5.2.1/libmatroska2/CMakeLists.txt.orig 2023-04-09 20:33:59.088225702 +0200
-+++ bcmatroska2-5.2.1/libmatroska2/CMakeLists.txt      2023-04-09 20:39:07.949885788 +0200
-@@ -56,6 +56,7 @@ if(ENABLE_SHARED)
-               set_target_properties(bcmatroska2 PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
-       endif()
-       target_include_directories(bcmatroska2 PRIVATE ../libebml2 .)
-+      target_link_libraries(bcmatroska2 bctoolbox)
-       if(LIBS)
-               target_link_libraries(bcmatroska2 ${LIBS})
-       endif()

diff --git a/bcmatroska2-static.patch b/bcmatroska2-static.patch
deleted file mode 100644 (file)
index 204a15c..0000000
--- a/bcmatroska2-static.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- bcmatroska2-5.2.1/libmatroska2/CMakeLists.txt.orig 2022-11-29 11:25:07.000000000 +0100
-+++ bcmatroska2-5.2.1/libmatroska2/CMakeLists.txt      2023-04-09 20:19:33.979579064 +0200
-@@ -33,17 +33,17 @@ endif()
- 
- string(REPLACE ";" " " LINK_FLAGS_STR "${LINK_FLAGS}")
- if(ENABLE_STATIC)
--      add_library(bcmatroska2 STATIC $<TARGET_OBJECTS:corec-objects> $<TARGET_OBJECTS:ebml2-objects> ${MATROSKA2_SOURCE_FILES})
--      set_target_properties(bcmatroska2 PROPERTIES OUTPUT_NAME bcmatroska2)
--      set_target_properties(bcmatroska2 PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-+      add_library(bcmatroska2-static STATIC $<TARGET_OBJECTS:corec-objects> $<TARGET_OBJECTS:ebml2-objects> ${MATROSKA2_SOURCE_FILES})
-+      set_target_properties(bcmatroska2-static PROPERTIES OUTPUT_NAME bcmatroska2)
-+      set_target_properties(bcmatroska2-static PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-       if(NOT "${LINK_FLAGS_STR}" STREQUAL "")
--              set_target_properties(bcmatroska2 PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
-+              set_target_properties(bcmatroska2-static PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
-       endif()
--      target_include_directories(bcmatroska2 PRIVATE ../libebml2 .)
-+      target_include_directories(bcmatroska2-static PRIVATE ../libebml2 .)
-       if(LIBS)
--              target_link_libraries(bcmatroska2 ${LIBS})
-+              target_link_libraries(bcmatroska2-static ${LIBS})
-       endif()
--      install(TARGETS bcmatroska2 EXPORT BcMatroska2Targets
-+      install(TARGETS bcmatroska2-static EXPORT BcMatroska2Targets
-               ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-               PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-       )

diff --git a/bcmatroska2.spec b/bcmatroska2.spec
index d6804e507076c8ca4d0d772d4277fe7459aabb4c..676d026547eedad5200ec34c11ce4c2d2c7e9517 100644 (file)
--- a/bcmatroska2.spec
+++ b/bcmatroska2.spec
@@ -1,22 +1,22 @@
 #
 # Conditional build:
-%bcond_without static_libs     # don't build static libraries
+%bcond_without static_libs     # static library
 #
 Summary:       Matroska2 library for Belledonne Communications projects
 Summary(pl.UTF-8):     Biblioteka Matroska2 do projektów Belledonne Communications
 Name:          bcmatroska2
-Version:       5.2.1
+Version:       5.3.26
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://gitlab.linphone.org/BC/public/bcmatroska2/-/tags
 Source0:       https://gitlab.linphone.org/BC/public/bcmatroska2/-/archive/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: dc8602f20ca33c6e3e6b08fd6b527abc
-Patch0:                %{name}-static.patch
-Patch1:                %{name}-link.patch
+# Source0-md5: 3a01147f051a1a05a97382cf84eabae3
 URL:           https://linphone.org/
+BuildRequires: bctoolbox-devel >= 5.3.0
 BuildRequires: cmake >= 3.1
 BuildRequires: rpmbuild(macros) >= 1.605
+Requires:      bctoolbox >= 5.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,6 +30,7 @@ Summary:      Header files for bcmatroska2 library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki bcmatroska2
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      bctoolbox-devel >= 5.3.0
 Obsoletes:     matroska-foundation-devel < 0.1
 
 %description devel
@@ -52,25 +53,34 @@ Statyczna biblioteka bcmatroska2.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-install -d build
-cd build
+%if %{with static_libs}
+install -d builddir-static
+cd builddir-static
 %cmake .. \
-       %{!?with_static_libs:-DENABLE_STATIC=OFF}
+       -DBUILD_SHARED_LIBS=OFF
+
+%{__make}
+cd ..
+%endif
+
+install -d builddir
+cd builddir
+%cmake ..
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C build 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}/bcmatroska2/cmake/BcMatroska2Targets.cmake
+%{__make} -C builddir install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,8 +99,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/corec
 %{_includedir}/ebml
 %{_includedir}/matroska
-%dir %{_datadir}/bcmatroska2
-%{_datadir}/bcmatroska2/cmake
+%dir %{_datadir}/BCMatroska2
+%{_datadir}/BCMatroska2/cmake
 
 %if %{with static_libs}
 %files static