Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bcmatroska2 for openSUSE:Factory checked in at 2021-07-18 23:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bcmatroska2 (Old) and /work/SRC/openSUSE:Factory/.bcmatroska2.new.2632 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bcmatroska2" Sun Jul 18 23:44:58 2021 rev:4 rq:906269 version:0.23~git.20210209 Changes: -------- --- /work/SRC/openSUSE:Factory/bcmatroska2/bcmatroska2.changes 2019-11-19 12:58:09.778178068 +0100 +++ /work/SRC/openSUSE:Factory/.bcmatroska2.new.2632/bcmatroska2.changes 2021-07-18 23:45:10.858939052 +0200 @@ -1,0 +2,10 @@ +Wed Jul 14 08:47:34 UTC 2021 - Paolo Stivanin <i...@paolostivanin.com> + +- Update to latest commit in order to be able to build the + latest version of mediastreamer2. + The 'Provides' field was added because we need mediastreamer2 to + depend on this latest version of the library, but upstream didn't + release a new tag. +- Rebase bcmatroska2-include-subdir.patch + +------------------------------------------------------------------- Old: ---- bcmatroska2-0.23.tar.gz New: ---- _service _servicedata bcmatroska2-0.23~git.20210209.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcmatroska2.spec ++++++ --- /var/tmp/diff_new_pack.EDj94L/_old 2021-07-18 23:45:11.382935021 +0200 +++ /var/tmp/diff_new_pack.EDj94L/_new 2021-07-18 23:45:11.386934990 +0200 @@ -1,7 +1,7 @@ # # spec file for package bcmatroska2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,13 @@ %define sover 0 Name: bcmatroska2 -Version: 0.23 +Version: 0.23~git.20210209 Release: 0 Summary: C Library to Deal with Matroska Files License: BSD-3-Clause AND Zlib AND GPL-2.0-or-later -URL: https://linphone.org/ -Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz +URL: https://gitlab.linphone.org/BC/public/bcmatroska2 +Source: bcmatroska2-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-OPENSUSE bcmatroska2-include-subdir.patch sor.ale...@meowr.ru -- Resolve a conflict with libebml and libmatroska. Patch0: bcmatroska2-include-subdir.patch BuildRequires: cmake @@ -41,6 +40,9 @@ %package devel Summary: Development files for bcmatroska2 Requires: lib%{name}-%{sover} = %{version} +# Needed by mediastreamer2. This is a fake minor version because upstream didn't release +# a '.1', therefore we've gotta use this workaround. +Provides: %{name}-devel = 0.23.1 %description devel This package includes the files necessary for compiling and linking @@ -66,9 +68,16 @@ %{_libdir}/lib%{name}.so.%{sover}* %files devel -%{_includedir}/%{name}/ -%{_libdir}/lib%{name}.so -%dir %{_datadir}/bcmatroska2/ -%{_datadir}/bcmatroska2/cmake/ +%dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/corec +%dir %{_includedir}/%{name}/ebml +%dir %{_includedir}/%{name}/matroska +%{_includedir}/%{name}/corec/* +%{_includedir}/%{name}/ebml/* +%{_includedir}/%{name}/matroska/* +%{_libdir}/libbcmatroska2.so +%dir %{_datadir}/bcmatroska2 +%dir %{_datadir}/bcmatroska2/cmake +%{_datadir}/bcmatroska2/cmake/* %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://gitlab.linphone.org/BC/public/bcmatroska2.git</param> <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@~git.%cd</param> <param name="revision">bc</param> <param name="scm">git</param> <param name="filename">bcmatroska2</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"> <param name="basename">bcmatroska2</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.linphone.org/BC/public/bcmatroska2.git</param> <param name="changesrevision">65545a8e38d391b5887069d046fbb4cb547c364d</param> </service> </servicedata> ++++++ bcmatroska2-include-subdir.patch ++++++ --- /var/tmp/diff_new_pack.EDj94L/_old 2021-07-18 23:45:11.450934498 +0200 +++ /var/tmp/diff_new_pack.EDj94L/_new 2021-07-18 23:45:11.450934498 +0200 @@ -1,16 +1,18 @@ ---- a/BcMatroska2Config.cmake.in -+++ b/BcMatroska2Config.cmake.in -@@ -34,6 +34,6 @@ if(@ENABLE_SHARED@) - else() - get_target_property(BCMATROSKA2_LIBRARIES bcmatroska2-static LOCATION) +diff -ru a/BcMatroska2Config.cmake.in b/BcMatroska2Config.cmake.in +--- a/BcMatroska2Config.cmake.in 2021-07-14 11:19:44.426789310 +0200 ++++ b/BcMatroska2Config.cmake.in 2021-07-14 11:21:50.035321221 +0200 +@@ -39,6 +39,6 @@ + get_target_property(BCMATROSKA2_LIBRARIES ${BCMATROSKA2_TARGETNAME} LOCATION) endif() + -set(BCMATROSKA2_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") +set(BCMATROSKA2_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@/bcmatroska2") set(BCMATROSKA2_FOUND 1) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ add_subdirectory(libebml2) +diff -ru a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-07-14 11:19:44.426789310 +0200 ++++ b/CMakeLists.txt 2021-07-14 11:21:14.463170591 +0200 +@@ -73,7 +73,7 @@ add_subdirectory(libmatroska2) install(FILES ${CMAKE_BINARY_DIR}/config.h @@ -19,9 +21,10 @@ ) include(CMakePackageConfigHelpers) ---- a/corec/corec/CMakeLists.txt -+++ b/corec/corec/CMakeLists.txt -@@ -97,18 +97,18 @@ install(FILES +diff -ru a/corec/corec/CMakeLists.txt b/corec/corec/CMakeLists.txt +--- a/corec/corec/CMakeLists.txt 2021-07-14 11:19:44.426789310 +0200 ++++ b/corec/corec/CMakeLists.txt 2021-07-14 11:22:56.323601950 +0200 +@@ -101,18 +101,18 @@ memalloc.h memheap.h portab.h @@ -46,7 +49,7 @@ install(FILES helpers/parser/buffer.h helpers/parser/dataheap.h -@@ -118,16 +118,16 @@ install(FILES +@@ -122,16 +122,16 @@ helpers/parser/strtab.h helpers/parser/strtypes.h helpers/parser/urlpart.h @@ -68,18 +71,21 @@ ) -install(FILES str/str.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/str) +install(FILES str/str.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/str) ---- a/libebml2/CMakeLists.txt -+++ b/libebml2/CMakeLists.txt -@@ -34,5 +34,5 @@ add_library(ebml2-objects OBJECT +Binary files a/.git/index and b/.git/index differ +diff -ru a/libebml2/CMakeLists.txt b/libebml2/CMakeLists.txt +--- a/libebml2/CMakeLists.txt 2021-07-14 11:19:44.442789377 +0200 ++++ b/libebml2/CMakeLists.txt 2021-07-14 11:20:29.858981710 +0200 +@@ -34,5 +34,5 @@ set_target_properties(ebml2-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE) install(DIRECTORY ebml - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2 ) ---- a/libmatroska2/CMakeLists.txt -+++ b/libmatroska2/CMakeLists.txt -@@ -76,5 +76,5 @@ if(ENABLE_SHARED) +diff -ru a/libmatroska2/CMakeLists.txt b/libmatroska2/CMakeLists.txt +--- a/libmatroska2/CMakeLists.txt 2021-07-14 11:19:44.442789377 +0200 ++++ b/libmatroska2/CMakeLists.txt 2021-07-14 11:20:08.898892951 +0200 +@@ -76,5 +76,5 @@ endif() install(DIRECTORY matroska
