Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked
in at 2021-02-15 23:20:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armnn"
Mon Feb 15 23:20:12 2021 rev:14 rq:872350 version:20.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2021-01-25
18:25:03.612554224 +0100
+++ /work/SRC/openSUSE:Factory/.armnn.new.28504/armnn.changes 2021-02-15
23:21:55.315899586 +0100
@@ -1,0 +2,6 @@
+Mon Feb 15 09:48:06 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Fix instalaltion of cmake files with an upstream patch:
+ * c5c40fe.diff
+
+-------------------------------------------------------------------
New:
----
c5c40fe.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armnn.spec ++++++
--- /var/tmp/diff_new_pack.Uann8o/_old 2021-02-15 23:21:56.219900936 +0100
+++ /var/tmp/diff_new_pack.Uann8o/_new 2021-02-15 23:21:56.223900942 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package armnn
+# spec file for package armnn%{?package_suffix}
#
# Copyright (c) 2021 SUSE LLC
#
@@ -92,6 +92,8 @@
Source1: armnn-rpmlintrc
# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/499
Patch1: 96beb97.diff
+# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/481
+Patch2: c5c40fe.diff
# PATCHES to add downstream ArmnnExamples binary -
https://layers.openembedded.org/layerindex/recipe/87610/
Patch200: 0003-add-more-test-command-line-arguments.patch
Patch201: 0005-add-armnn-mobilenet-test-example.patch
@@ -427,6 +429,7 @@
%prep
%setup -q -n armnn-%{version}
%patch1 -p1
+%patch2 -p1
%if %{with armnn_extra_tests}
%patch200 -p1
%patch201 -p1
@@ -457,9 +460,6 @@
%endif
%endif
%endif
-# Fix *.cmake installation path -
https://github.com/ARM-software/armnn/issues/481
-sed -i 's#set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR})#set(INSTALL_CONFIGDIR
${CMAKE_INSTALL_LIBDIR}/cmake/Armnn)#' CMakeLists.txt
-sed -i 's# DESTINATION ${CMAKE_INSTALL_LIBDIR}# DESTINATION
${CMAKE_INSTALL_LIBDIR}/cmake/Armnn#' CMakeLists.txt
%cmake \
-DCMAKE_SKIP_RPATH=True \
-DSHARED_BOOST=1 \
@@ -720,8 +720,8 @@
%{_includedir}/armnnQuantizer/INetworkQuantizer.hpp
%dir %{_includedir}/armnnSerializer/
%{_includedir}/armnnSerializer/ISerializer.hpp
-%dir %{_libdir}/cmake/Armnn
-%{_libdir}/cmake/Armnn/*
+%dir %{_libdir}/cmake/armnn
+%{_libdir}/cmake/armnn/*
%{_libdir}/libarmnn.so
%{_libdir}/libarmnnBasePipeServer.so
%{_libdir}/libtimelineDecoder.so
++++++ c5c40fe.diff ++++++
>From c5c40fef3d4b3de5d1aa26c1c4dc72dcd74a8bc6 Mon Sep 17 00:00:00 2001
From: Keith Mok <ek9...@gmail.com>
Date: Fri, 08 Jan 2021 15:25:14 -0800
Subject: [PATCH] ArmnnConfig.cmake install to correct directory
Signed-off-by: Keith Mok <ek9...@gmail.com>
Change-Id: I9b1037275379bdbf452589357576cfa763b7c128
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 789e2d9..a2b6e90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1160,7 +1160,7 @@
EXPORT armnn-targets
FILE ArmnnTargets.cmake
NAMESPACE Armnn::
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)
####################################################
@@ -1173,7 +1173,7 @@
configure_package_config_file(
${CMAKE_CURRENT_LIST_DIR}/cmake/ArmnnConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/ArmnnConfig.cmake
- INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)
####################################################
@@ -1181,7 +1181,7 @@
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/ArmnnConfig.cmake
- DESTINATION ${INSTALL_CONFIGDIR}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)
####################################################
