From 70e014c6bd27457faf52224a9954b8a22a638fd1 Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Sun, 13 Oct 2024 11:22:44 +0200
Subject: [PATCH] Rename/reorganize workflow a bit

---
 .github/workflows/ci.yaml | 10 +++++++---
 CMakeLists.txt            |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 28a0b4e..4b0565a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ on:
     inputs:
       publish-version:
         description: "new version that should get published"
-        required: false
+        required: true
 
 jobs:
   build:
@@ -59,9 +59,11 @@ jobs:
             echo 'APT::Get::Assume-Yes "true";' >>  /etc/apt/apt.conf
           elif [[ "${{ matrix.os.name }}" == "fedora" ]]; then
             echo "defaultyes=True" >> /etc/dnf/dnf.conf
+            dnf install rpm-build
           elif [[ "${{ matrix.os.name }}" == "opensuse" ]]; then
             zypper refresh
             CMD=$(echo $CMD | sed 's/zypper/zypper --non-interactive/')
+            zypper install rpm-build
           else
             echo "Unsupported OS: ${{ matrix.os.name }}"
             exit 1
@@ -86,10 +88,12 @@ jobs:
             CMAKE_ARGS="$CMAKE_ARGS -DCPACK_OS=${{ matrix.os.name }}"
           fi
           if [[ "${{ matrix.plasma_version }}" == "plasma6" ]]; then
-            cmake $CMAKE_ARGS -DBUILD_WITH_QT6=ON
+            CMAKE_ARGS="$CMAKE_ARGS -DBUILD_WITH_QT6=ON"
           else
-            cmake $CMAKE_ARGS -DBUILD_WITH_QT6=OFF
+            CMAKE_ARGS="$CMAKE_ARGS -DBUILD_WITH_QT6=OFF"
           fi
+          echo cmake $CMAKE_ARGS
+          cmake $CMAKE_ARGS
           cmake --build . -j2
           cmake --install .
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dbabea..63bd55b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ else()
 	set(KRUNNER_PACKAGE_VERSION ${KF6Runner_VERSION})
 endif()
 # Then names of dependencies and paths might differ
-if (CPACK_OS STREQUAL "debian")
+if (CPACK_OS STREQUAL "ubuntu")
 	set(CPACK_DEBIAN_PACKAGE_DEPENDS "libkf5runner5 (>=${KRUNNER_PACKAGE_VERSION})")
 	set(CPACK_DEBIAN_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Debian.deb")
 	set(CPACK_GENERATOR "DEB")