bctoolbox 4.4.24-1 (armv7hnl;x86_64;znver1;aarch64) 2021-13577
0
| Status | rejected | ||||||||||||||||||||||||||||||||||||
| Submitter | mandian [@T] openmailbox.org | ||||||||||||||||||||||||||||||||||||
| Platform | rolling | ||||||||||||||||||||||||||||||||||||
| Repository | main | ||||||||||||||||||||||||||||||||||||
| URL | https://abf.openmandriva.org/build_lists/982474 | ||||||||||||||||||||||||||||||||||||
| Packages |
|
||||||||||||||||||||||||||||||||||||
| Build Date | 2021-02-07 00:17:08 +0000 UTC | ||||||||||||||||||||||||||||||||||||
| Last Updated | 2021-02-11 18:50:13.353798318 +0000 UTC |
$ git show --format=fuller --patch-with-stat --summary 481ff2140804a2636b1b4b56932975de2744c6d9
commit 481ff2140804a2636b1b4b56932975de2744c6d9
Author: mandian <mandian@users.noreply.github.com>
AuthorDate: Sun Jan 31 03:32:39 2021 +0100
Commit: mandian <mandian@users.noreply.github.com>
CommitDate: Sun Jan 31 03:32:39 2021 +0100
fix cmake path
---
bctoolbox-4.4.24-cmake-fix-pkgconfig-pc-file.patch | 12 +++++++++++
bctoolbox.spec | 25 ++++++++++++----------
2 files changed, 26 insertions(+), 11 deletions(-)
create mode 100644 bctoolbox-4.4.24-cmake-fix-pkgconfig-pc-file.patch
diff --git a/bctoolbox-4.4.24-cmake-fix-pkgconfig-pc-file.patch b/bctoolbox-4.4.24-cmake-fix-pkgconfig-pc-file.patch
new file mode 100644
index 0000000..ebd42a6
--- /dev/null
+++ b/bctoolbox-4.4.24-cmake-fix-pkgconfig-pc-file.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -167,7 +167,7 @@
+ endif()
+
+ 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/bctoolbox.spec b/bctoolbox.spec
index f8b84c2..a5d5381 100644
--- a/bctoolbox.spec
+++ b/bctoolbox.spec
@@ -15,6 +15,7 @@ License: LGPLv2+
Group: System/Libraries
Url: https://github.com/BelledonneCommunications/
Source0: https://github.com/BelledonneCommunications/bctoolbox/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0: bctoolbox-4.4.24-cmake-fix-pkgconfig-pc-file.patch
BuildRequires: cmake
BuildRequires: pkgconfig(bcunit)
BuildRequires: mbedtls-devel
@@ -61,6 +62,14 @@ Obsoletes: %{name}-devel-doc < 1.0.15-2
%description -n %{devname}
This package includes the development files for %{name}.
+%files -n %{devname}
+%{_libdir}/libbctoolbox.so
+%{_libdir}/libbctoolbox-tester.so
+%{_includedir}/%{name}
+%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/%{name}-tester.pc
+%{_datadir}/cmake/%{name}
+
#---------------------------------------------------------------------------
%package -n %{devstat}
@@ -70,28 +79,21 @@ Requires: %{devname} = %{version}-%{release}
Provides: %{name}-static-devel = %{version}-%{release}
%rename %{_lib}bctoolbox-static
+%description -n %{devstat}
+This package includes the static library files for %{name}.
+
%files -n %{devstat}
%{_libdir}/libbctoolbox.a
%{_libdir}/libbctoolbox-tester.a
-%files -n %{devname}
-%{_libdir}/libbctoolbox.so
-%{_libdir}/libbctoolbox-tester.so
-%{_includedir}/%{name}
-%{_datadir}/%{name}/cmake/
-%{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/pkgconfig/%{name}-tester.pc
-
#---------------------------------------------------------------------------
-%description -n %{devstat}
-This package includes the static library files for %{name}.
%prep
%autosetup -p1
%build
-sed -i 's!CMAKE_INSTALL_PREFIX}/lib!CMAKE_INSTALL_PREFIX}/%{_lib}!g' CMakeLists.txt
+#sed -i 's!CMAKE_INSTALL_PREFIX}/lib!CMAKE_INSTALL_PREFIX}/%{_lib}!g' CMakeLists.txt
%cmake \
-DENABLE_STRICT:BOOL=NO \
-DENABLE_MBEDTLS:BOOL=ON \
@@ -101,3 +103,4 @@ sed -i 's!CMAKE_INSTALL_PREFIX}/lib!CMAKE_INSTALL_PREFIX}/%{_lib}!g' CMakeLists.
%install
%make_install -C build
+
Not Available
| benbullard79 [@T] cox.net | No Comment. | 1722d 04hrs |