Skip to content

Commit 53746a5

Browse files
committed
Packaging: updated SUSE packaging based on consultation with Lubos Kocman at InstallFest 2025
https://build.opensuse.org/request/show/1253505 Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
1 parent 0c7291d commit 53746a5

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ if("${DEV_MODE}")
249249
set(PACKAGE_MAINTAINER "${JAKUB_DUPAK}")
250250
set(PACKAGE_URL "${PROJECT_HOMEPAGE_URL}")
251251
set(PACKAGE_GIT "github.com:cvut/qtmips.git")
252-
set(PACKAGE_LICENCE "${LICENCE} ")
252+
set(PACKAGE_LICENCE "${LICENCE}")
253253

254254
include(cmake/PackageTools.cmake)
255255

extras/packaging/rpm/spec.in

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ URL: @PACKAGE_URL@
3232
Source: @PACKAGE_SOURCE_ARCHIVE_FILE@
3333
BuildRequires: cmake
3434
BuildRequires: gcc-c++
35+
BuildRequires: hicolor-icon-theme
3536
BuildRequires: pkgconfig
3637
BuildRequires: pkgconfig(Qt5Core)
37-
BuildRequires: pkgconfig(Qt5Widgets)
38-
BuildRequires: pkgconfig(Qt5Test)
3938
BuildRequires: pkgconfig(Qt5PrintSupport)
40-
BuildRequires: hicolor-icon-theme
41-
39+
BuildRequires: pkgconfig(Qt5Test)
40+
BuildRequires: pkgconfig(Qt5Widgets)
4241
%if ! 0%{?suse_version}
43-
BuildRequires: pkgconfig(libelf)
4442
BuildRequires: desktop-file-utils
43+
BuildRequires: pkgconfig(libelf)
4544
%endif
4645

4746
%if 0%{?suse_version}
@@ -72,16 +71,16 @@ BuildRequires: update-desktop-files
7271
%endif
7372

7473
%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
75-
desktop-file-validate %{buildroot}/usr/share/applications/@PACKAGE_NAME@.desktop
74+
desktop-file-validate %{buildroot}%{_datadir}/applications/@PACKAGE_NAME@.desktop
7675
%endif
7776

7877
# TODO: this should be generated from CMake
7978
%files
80-
/usr/bin/qtmips_gui
81-
/usr/bin/qtmips_cli
82-
/usr/share/icons/hicolor/scalable/apps/qtmips_gui.svg
83-
/usr/share/icons/hicolor/48x48/apps/qtmips_gui.png
84-
/usr/share/applications/qtmips.desktop
79+
%{_bindir}/qtmips_gui
80+
%{_bindir}/qtmips_cli
81+
%{_datadir}/icons/hicolor/scalable/apps/qtmips_gui.svg
82+
%{_datadir}/icons/hicolor/48x48/apps/qtmips_gui.png
83+
%{_datadir}/applications/qtmips.desktop
8584

8685
%license LICENSE
8786
%doc README.md

0 commit comments

Comments
 (0)