public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/nitrokey-app] rawhide: Fix F45FTBS commit based on lecris work
@ 2026-08-05 19:13 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-08-05 19:13 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/nitrokey-app
            Branch : rawhide
            Commit : 5ae38ad953fe1d0b6b640740a9ee6c9583fba5b7
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-08-05T16:11:49-03:00
            Stats  : +15/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/nitrokey-app/c/5ae38ad953fe1d0b6b640740a9ee6c9583fba5b7?branch=rawhide

            Log:
            Fix F45FTBS commit based on lecris work

https://src.fedoraproject.org/rpms/nitrokey-app/pull-request/2

Resolves: rhbz#2380934
Resolves: rhbz#2504369

---
diff --git a/cmake4.patch b/cmake4.patch
new file mode 100644
index 0000000..6d38ca6
--- /dev/null
+++ b/cmake4.patch
@@ -0,0 +1,10 @@
+diff -ru nitrokey-app-1.4.2/CMakeLists.txt nitrokey-app-1.4.2-new/CMakeLists.txt
+--- nitrokey-app-1.4.2/CMakeLists.txt	2020-08-20 14:34:16.000000000 +0200
++++ nitrokey-app-1.4.2-new/CMakeLists.txt	2026-01-09 17:26:39.163958913 +0100
+@@ -1,5 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0 FATAL_ERROR)
+-cmake_policy(SET CMP0043 OLD) # cmake --help-policy CMP0043
++CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+ 
+ PROJECT(NitrokeyApp LANGUAGES CXX)
+ SET(PROJECT_VERSION "1.4.2")

diff --git a/nitrokey-app.spec b/nitrokey-app.spec
index 628148b..5e45b28 100644
--- a/nitrokey-app.spec
+++ b/nitrokey-app.spec
@@ -2,13 +2,13 @@ Name:           nitrokey-app
 Version:        1.4.2
 Release:        15%{?dist}
 Summary:        Nitrokey's Application
-
-# Automatically converted from old format: GPLv3+ - review is highly recommended.
 License:        GPL-3.0-or-later
 URL:            https://github.com/Nitrokey/nitrokey-app
 Source0:        %{url}/archive/v%{version_no_tilde -}/%{name}-%{version}.tar.gz
 # Non-upstreamable, required to unbundle libraries
-Patch0001:      0001-don-t-show-information-about-3rd-party-licenses.patch
+Patch:          0001-don-t-show-information-about-3rd-party-licenses.patch
+# Based on https://github.com/Nitrokey/nitrokey-app/issues/498
+Patch:          cmake4.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake >= 3.1.0
@@ -37,6 +37,8 @@ rm -vr 3rdparty
 rm -vr libnitrokey
 
 %build
+# TODO: Please submit an issue to upstream (rhbz#2380934)
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
 %cmake %{_vpath_srcdir} -B%{_vpath_builddir} -GNinja \
   -DADD_GIT_INFO=FALSE \
   %{nil}

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-05 19:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-05 19:13 [rpms/nitrokey-app] rawhide: Fix F45FTBS commit based on lecris work Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox