public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <rosset.filipe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/nitrokey-app] rawhide: move to forge macros, build with cmake + ninja
Date: Wed, 05 Aug 2026 19:30:12 GMT	[thread overview]
Message-ID: <178595821285.1.3363145686801237771.rpms-nitrokey-app-313c28cd9bb3@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/nitrokey-app
Branch : rawhide
Commit : 313c28cd9bb31970720d9dd7f992605912cd2cb8
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-08-05T16:29:36-03:00
Stats  : +23/-20 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/nitrokey-app/c/313c28cd9bb31970720d9dd7f992605912cd2cb8?branch=rawhide

Log:
move to forge macros, build with cmake + ninja

---
diff --git a/nitrokey-app.spec b/nitrokey-app.spec
index f118cb2..e505ed3 100644
--- a/nitrokey-app.spec
+++ b/nitrokey-app.spec
@@ -1,36 +1,42 @@
-Name:           nitrokey-app
+%global forgeurl https://github.com/Nitrokey/nitrokey-app
 Version:        1.4.2
+%forgemeta
+
+Name:           nitrokey-app
 Release:        %autorelease
 Summary:        Nitrokey's Application
 License:        GPL-3.0-or-later
-URL:            https://github.com/Nitrokey/nitrokey-app
-Source0:        %{url}/archive/v%{version_no_tilde -}/%{name}-%{version}.tar.gz
+URL:            %{forgeurl}
+Source:         %{forgesource}
+
 # Non-upstreamable, required to unbundle libraries
 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
-BuildRequires:  ninja-build
+BuildRequires:  cmake
+BuildRequires:  cmake(Qt5Concurrent)
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Gui)
-BuildRequires:  cmake(Qt5Widgets)
-BuildRequires:  cmake(Qt5Svg)
-BuildRequires:  cmake(Qt5Concurrent)
 BuildRequires:  cmake(Qt5LinguistTools)
+BuildRequires:  cmake(Qt5Svg)
+BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc-c++
+BuildRequires:  libappstream-glib
+BuildRequires:  ninja-build
 BuildRequires:  pkgconfig(bash-completion)
-BuildRequires:  pkgconfig(libnitrokey-1) >= 3.5
 BuildRequires:  pkgconfig(cppcodec-1)
-BuildRequires:  /usr/bin/desktop-file-validate
-BuildRequires:  /usr/bin/appstream-util
+BuildRequires:  pkgconfig(libnitrokey-1) >= 3.5
+
 Requires:       hicolor-icon-theme
 
 %description
 %{summary}.
 
 %prep
-%autosetup -p1
+%autosetup %{forgesetupargs} -p1
 # Remove 3rdparty libraries
 rm -vr 3rdparty
 # Unbundle libnitrokey
@@ -39,13 +45,11 @@ 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}
-%ninja_build -C %{_vpath_builddir}
+%cmake -GNinja -DADD_GIT_INFO=FALSE
+%cmake_build
 
 %install
-%ninja_install -C %{_vpath_builddir}
+%cmake_install
 
 # We don't need ubuntu icons
 rm -vr %{buildroot}%{_datadir}/icons/ubuntu*
@@ -56,14 +60,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.nitrokey.%
 
 %files
 %license LICENSES/GPLv3
+%doc README.md CHANGELOG.md
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_metainfodir}/com.nitrokey.%{name}.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/pixmaps/%{name}.png
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/%{name}
 
 %changelog

                 reply	other threads:[~2026-08-05 19:30 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178595821285.1.3363145686801237771.rpms-nitrokey-app-313c28cd9bb3@fedoraproject.org \
    --to=rosset.filipe@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox