commit ckb-next for openSUSE:Factory

Hello community, here is the log from the commit of package ckb-next for openSUSE:Factory checked in at 2019-06-06 18:15:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ckb-next (Old) and /work/SRC/openSUSE:Factory/.ckb-next.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ckb-next" Thu Jun 6 18:15:32 2019 rev:3 rq:706242 version:0.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ckb-next/ckb-next.changes 2019-03-26 15:42:05.868255072 +0100 +++ /work/SRC/openSUSE:Factory/.ckb-next.new.4811/ckb-next.changes 2019-06-06 18:15:33.456717034 +0200 @@ -1,0 +2,5 @@ +Wed May 29 03:55:59 UTC 2019 - Bernhard Wiedemann + +- Add 422.patch to fix animations dir (boo#1135528) + +------------------------------------------------------------------- New: ---- 422.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ckb-next.spec ++++++ --- /var/tmp/diff_new_pack.tA6eSd/_old 2019-06-06 18:15:34.160716828 +0200 +++ /var/tmp/diff_new_pack.tA6eSd/_new 2019-06-06 18:15:34.164716826 +0200 @@ -32,6 +32,8 @@ Patch3: ckb-next-no-cmake-modules.patch # PATCH-FIX-UPSTREAM ckb-next-udev.patch Patch4: ckb-next-udev.patch +# PATCH-FIX-UPSTREAM 422.patch boo#1135528 +Patch5: 422.patch BuildRequires: ImageMagick BuildRequires: cmake BuildRequires: hicolor-icon-theme @@ -63,6 +65,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %cmake \ ++++++ 422.patch ++++++ https://github.com/ckb-next/ckb-next/pull/422

From 257d39dc187f818c6c77a7fb50b994eaa613cbb1 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Wed, 29 May 2019 05:28:33 +0200 Subject: [PATCH] Do not prepend /usr to libexecdir

Fix #276 Without this patch, compiling with -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} expanded this to /usr//usr/lib/ckb-next-animations and there is no rpm macro to have libexecdir without /usr but we need to use these macros to be able to use the same .spec file across distributions (Fedora has /usr/libexec and openSUSE has /usr/lib ) This matches usage in src/daemon/CMakeLists.txt --- src/CMakeLists.txt | 2 +- src/ckbnextconfig.h.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 07804972..1b9a9e59 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,7 +27,7 @@ # Export version, etc. to source code set(CKB_NEXT_VERSION_STR "${ckb-next_VERSION}") -set(CKB_NEXT_ANIMATIONS_PATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_DIR_ANIMATIONS}") +set(CKB_NEXT_ANIMATIONS_PATH "${INSTALL_DIR_ANIMATIONS}") configure_file( ${CMAKE_CURRENT_LIST_DIR}/ckbnextconfig.h.in ${CMAKE_BINARY_DIR}/ckbnextconfig.h) diff --git a/src/ckbnextconfig.h.in b/src/ckbnextconfig.h.in index 7842968a..ed5e2404 100644 --- a/src/ckbnextconfig.h.in +++ b/src/ckbnextconfig.h.in @@ -1,5 +1,5 @@ #cmakedefine CKB_NEXT_VERSION_STR "${ckb-next_VERSION}" -#cmakedefine CKB_NEXT_ANIMATIONS_PATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_DIR_ANIMATIONS}" +#cmakedefine CKB_NEXT_ANIMATIONS_PATH "${INSTALL_DIR_ANIMATIONS}" #define CKB_NEXT_PROFILE_VER ${ckb-next_PROFILE_VER}