fix versioning and deps

jstkdng · Feb 24, 2024 · 6405cd3 · 6405cd3
1 parent 73b057a
commit 6405cd3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/obs-upload.sh b/.github/workflows/obs-upload.sh
@@ -2,7 +2,7 @@
 set -e
 
 DATETIME=$(date -R)
-VERSION=$(grep "project(" CMakeLists.txt | grep -oP '\(\K[^\)]+' | cut -f 6 -d ' ')
+VERSION=$(grep "set(UEBERZUGPP_VERSION" CMakeLists.txt | grep -oP '\(\K[^\)]+' | cut -f 2 -d ' ')
 TARFILE="ueberzugpp_$VERSION.tar.xz"
 DSCFILE="ueberzugpp.dsc"
 SPECFILE="ueberzugpp.spec"
@@ -65,10 +65,10 @@ BuildRequires:  cmake(spdlog)
 BuildRequires:  extra-cmake-modules
 BuildRequires:  gcc-c++
 BuildRequires:  make
+BuildRequires:  range-v3-devel
 BuildRequires:	pkgconfig(openssl)
 BuildRequires:  pkgconfig(CLI11)
 BuildRequires:  pkgconfig(chafa)
-BuildRequires:  pkgconfig(range-v3)
 BuildRequires:  pkgconfig(libsixel)
 BuildRequires:  pkgconfig(nlohmann_json)
 BuildRequires:  pkgconfig(opencv4)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,7 @@ endif()
 cmake_policy(SET CMP0075 NEW)
 cmake_policy(SET CMP0077 NEW)
 
+set(UEBERZUGPP_VERSION 2.9.3)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -34,7 +35,7 @@ set(CMAKE_BUILD_TYPE
 project(
   ueberzugpp
   LANGUAGES CXX C
-  VERSION 2.9.3)
+  VERSION ${UEBERZUGPP_VERSION})
 add_executable(ueberzug)
 
 option(ENABLE_X11 "Enable X11 canvas." ON)

diff --git a/debian/control b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
  libxcb-res0-dev,
  wayland-protocols,
  libwayland-dev,
- range-v3-dev,
+ librange-v3-dev,
  extra-cmake-modules
 
 Package: ueberzugpp