$ git show --format=fuller --patch-with-stat --summary 3df16cf2d1de5c79bf006c1796dab725777cffb7
commit 3df16cf2d1de5c79bf006c1796dab725777cffb7
Author: mandian <mandian@users.noreply.github.com>
AuthorDate: Sun Nov 7 00:22:45 2021 +0100
Commit: mandian <mandian@users.noreply.github.com>
CommitDate: Sun Nov 7 00:22:45 2021 +0100
fix BR
---
bzrtp-1.0.6-cmake-config-location.patch | 12 ---------
bzrtp-1.0.6-cmake-install-pkgconfig-pc-file.patch | 32 -----------------------
bzrtp-1.0.6.tar.gz.md5 | 1 -
bzrtp.spec | 1 +
4 files changed, 1 insertion(+), 45 deletions(-)
delete mode 100644 bzrtp-1.0.6-cmake-config-location.patch
delete mode 100644 bzrtp-1.0.6-cmake-install-pkgconfig-pc-file.patch
delete mode 100644 bzrtp-1.0.6.tar.gz.md5
diff --git a/bzrtp-1.0.6-cmake-config-location.patch b/bzrtp-1.0.6-cmake-config-location.patch
deleted file mode 100644
index 836934f..0000000
--- a/bzrtp-1.0.6-cmake-config-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bzrtp-4.4.6/CMakeLists.txt.2~ bzrtp-4.4.6/CMakeLists.txt
---- bzrtp-4.4.6/CMakeLists.txt.2~ 2020-11-09 21:28:17.553578431 +0100
-+++ bzrtp-4.4.6/CMakeLists.txt 2020-11-09 21:28:46.788171390 +0100
-@@ -126,7 +126,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI
- )
-
- include(CMakePackageConfigHelpers)
--set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake")
-+set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}")
-
- write_basic_package_version_file(
- "${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_TARGETS_NAME}ConfigVersion.cmake"
diff --git a/bzrtp-1.0.6-cmake-install-pkgconfig-pc-file.patch b/bzrtp-1.0.6-cmake-install-pkgconfig-pc-file.patch
deleted file mode 100644
index d1b2223..0000000
--- a/bzrtp-1.0.6-cmake-install-pkgconfig-pc-file.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up bzrtp-4.4.6/CMakeLists.txt.1~ bzrtp-4.4.6/CMakeLists.txt
---- bzrtp-4.4.6/CMakeLists.txt.1~ 2020-11-09 21:26:24.107959114 +0100
-+++ bzrtp-4.4.6/CMakeLists.txt 2020-11-09 21:27:32.208110792 +0100
-@@ -114,6 +114,16 @@ if(ENABLE_TESTS)
- add_subdirectory(test)
- endif()
-
-+set(prefix ${CMAKE_INSTALL_PREFIX})
-+set(exec_prefix ${prefix}/libexec)
-+set(libdir ${prefix}/lib${LIB_SUFFIX})
-+set(includedir ${prefix}/include)
-+set(PACKAGE_VERSION ${PROJECT_VERSION})
-+
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libbzrtp.pc.in
-+ "${CMAKE_CURRENT_BINARY_DIR}/libbzrtp.pc"
-+ @ONLY
-+)
-
- include(CMakePackageConfigHelpers)
- set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake")
-@@ -143,6 +153,11 @@ install(FILES
- DESTINATION ${CONFIG_PACKAGE_LOCATION}
- )
-
-+install(FILES
-+ "${CMAKE_CURRENT_BINARY_DIR}/libbzrtp.pc"
-+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
-+)
-+
- if (ENABLE_PACKAGE_SOURCE)
- add_subdirectory(build)
- endif()
diff --git a/bzrtp-1.0.6.tar.gz.md5 b/bzrtp-1.0.6.tar.gz.md5
deleted file mode 100644
index c4ecef9..0000000
--- a/bzrtp-1.0.6.tar.gz.md5
+++ /dev/null
@@ -1 +0,0 @@
-e77a6b074bb810a02cc77a1df776fb79 bzrtp-1.0.6.tar.gz
diff --git a/bzrtp.spec b/bzrtp.spec
index e1ff33c..96fabb8 100644
--- a/bzrtp.spec
+++ b/bzrtp.spec
@@ -15,6 +15,7 @@ Patch0: bzrtp-5.0.18-cmake-install-pkgconfig-pc-file.patch
# (wally) alow overriding cmake config file location from cmd line
Patch1: bzrtp-5.0.18-cmake-config-location.patch
BuildRequires: cmake
+BuildRequires: ninja
BuildRequires: pkgconfig(bctoolbox)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(sqlite3)