diff --git a/files/0001-We-use-systemd-don-t-check-for-this-file.patch b/files/0001-We-use-systemd-don-t-check-for-this-file.patch deleted file mode 100644 --- a/files/0001-We-use-systemd-don-t-check-for-this-file.patch +++ /dev/null @@ -1,85 +0,0 @@ -From aa1f57926f8f380055b9020650952dfe4779a76c Mon Sep 17 00:00:00 2001 -From: Joshua Strobl -Date: Sun, 19 Aug 2018 00:59:29 +0300 -Subject: [PATCH 1/1] We use systemd, don't check for this file. - ---- - src/daemon/CMakeLists.txt | 60 ++++++++++++++++++--------------------- - 1 file changed, 28 insertions(+), 32 deletions(-) - -diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt -index 09056a7..eecb1f8 100644 ---- a/src/daemon/CMakeLists.txt -+++ b/src/daemon/CMakeLists.txt -@@ -291,40 +291,36 @@ elseif (LINUX) - - endif () - -- # A way to check for systemd -- if (EXISTS "/run/systemd/system") -- message(STATUS "systemd detected") -- set(CKB_NEXT_INIT_SYSTEM "systemd" CACHE INTERNAL "") -- set(DISALLOW_SYSVINIT TRUE) -- -- # Generate and import service -- message(STATUS "Generating and importing ckb-next-daemon.service (${CKB_NEXT_INIT_SYSTEM})") -- configure_file( -- "${ckb-next_SOURCE_DIR}/linux/systemd/ckb-next-daemon.service.in" -- "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" -- @ONLY) -+ message(STATUS "systemd detected") -+ set(CKB_NEXT_INIT_SYSTEM "systemd" CACHE INTERNAL "") -+ set(DISALLOW_SYSVINIT TRUE) - -- if (SAFE_INSTALL) -- foreach (daemon IN ITEMS "ckb-daemon" "ckb-next-daemon") -- execute_process( -- COMMAND sudo systemctl is-active ${daemon}.service -- RESULT_VARIABLE daemon_active) -- if ("${daemon_active}" EQUAL 0) -- message(STATUS "Running ${daemon} detected") -- install(CODE "message(STATUS \"${CKB_NEXT_INIT_SYSTEM}: stoppping ${daemon}\")") -- install(CODE "execute_process(COMMAND sudo systemctl stop ${daemon}.service)") -- endif () -- execute_process( -- COMMAND sudo systemctl is-enabled ${daemon}.service -- RESULT_VARIABLE daemon_enabled) -- if ("${daemon_enabled}" EQUAL 0) -- message(STATUS "Enabled ${daemon} detected") -- install(CODE "message(STATUS \"${CKB_NEXT_INIT_SYSTEM}: permanently disabling ${daemon}\")") -- install(CODE "execute_process(COMMAND sudo systemctl disable ${daemon}.service)") -- endif () -- endforeach () -- endif () -+ # Generate and import service -+ message(STATUS "Generating and importing ckb-next-daemon.service (${CKB_NEXT_INIT_SYSTEM})") -+ configure_file( -+ "${ckb-next_SOURCE_DIR}/linux/systemd/ckb-next-daemon.service.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" -+ @ONLY) - -+ if (SAFE_INSTALL) -+ foreach (daemon IN ITEMS "ckb-daemon" "ckb-next-daemon") -+ execute_process( -+ COMMAND sudo systemctl is-active ${daemon}.service -+ RESULT_VARIABLE daemon_active) -+ if ("${daemon_active}" EQUAL 0) -+ message(STATUS "Running ${daemon} detected") -+ install(CODE "message(STATUS \"${CKB_NEXT_INIT_SYSTEM}: stoppping ${daemon}\")") -+ install(CODE "execute_process(COMMAND sudo systemctl stop ${daemon}.service)") -+ endif () -+ execute_process( -+ COMMAND sudo systemctl is-enabled ${daemon}.service -+ RESULT_VARIABLE daemon_enabled) -+ if ("${daemon_enabled}" EQUAL 0) -+ message(STATUS "Enabled ${daemon} detected") -+ install(CODE "message(STATUS \"${CKB_NEXT_INIT_SYSTEM}: permanently disabling ${daemon}\")") -+ install(CODE "execute_process(COMMAND sudo systemctl disable ${daemon}.service)") -+ endif () -+ endforeach () - endif () - - # A way to check for OpenRC --- -2.18.0 - diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : ckb -version : 0.4.0 -release : 8 +version : 0.4.2 +release : 9 source : - - https://github.com/ckb-next/ckb-next/archive/v0.4.0.tar.gz : 5521c5a94e87ba035c6d9340e37785fa6f29710215f3e3201bb6949c88de8bd1 + - https://github.com/ckb-next/ckb-next/archive/v0.4.2.tar.gz : 75b6908d5590c293dee8258a83d4ebe206306d3df9f867596e953ef7c6a86440 license : GPL-2.0-only component : desktop.core summary : an open-source driver for Corsair keyboards and mice @@ -11,15 +11,12 @@ builddeps : - pkgconfig(Qt5Core) setup : | - %patch -p1 < $pkgfiles/0001-We-use-systemd-don-t-check-for-this-file.patch mkdir build && cd build - %cmake -DDISABLE_UPDATER=1 .. + %cmake -DDISABLE_UPDATER=1 -DFORCE_INIT_SYSTEM="systemd" -DUDEV_RULE_DIRECTORY="%libdir%/udev/rules.d/" .. build : | %make -C build install : | %make_install -C build # Safety symlink ln -s /usr/lib/systemd/systemd/ckb-next-daemon.service $installdir/usr/lib/systemd/system/ckb-daemon.service - # Put udev bits in right place - install -Dm00644 linux/udev/99-ckb-next-daemon.rules $installdir%libdir%/udev/rules.d/99-ckb-daemon.rules rm -rf $installdir/etc/ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ ckb - Ricky Grassmuck - rigrassm@gmail.com + Campbell Jones + me@serebit.com GPL-2.0-only desktop.core @@ -24,8 +24,7 @@ /usr/bin/ckb-next-dev-detect /usr/lib/systemd/system/ckb-daemon.service /usr/lib/systemd/system/ckb-next-daemon.service - /usr/lib/udev/rules.d/99-ckb-next-daemon.rules - /usr/lib64/udev/rules.d/99-ckb-daemon.rules + /usr/lib64/udev/rules.d/99-ckb-next-daemon.rules /usr/libexec/ckb-next-animations/gradient /usr/libexec/ckb-next-animations/heat /usr/libexec/ckb-next-animations/invaders @@ -48,7 +47,7 @@ programming.devel - ckb + ckb /usr/lib64/cmake/ckb-next/Animation/AnimationConfig.cmake @@ -57,12 +56,12 @@ - - 2019-04-13 - 0.4.0 + + 2019-10-11 + 0.4.2 Packaging update - Ricky Grassmuck - rigrassm@gmail.com + Campbell Jones + me@serebit.com \ No newline at end of file