From 54b76109c2e6bcb051305f93e8258855ce53c559 Mon Sep 17 00:00:00 2001 From: James Magahern Date: Fri, 8 Aug 2025 13:47:21 -0700 Subject: [PATCH] Fixes rpm build --- Dockerfile | 30 ++++++++++++++++++++++++++++++ dist/rpm/kordophone.spec | 5 +++-- src/meson.build | 2 +- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d3bbb2b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,30 @@ +FROM fedora:39 + +# Install RPM build tools and dependencies +RUN dnf update -y && dnf install -y \ + rpm-build \ + rpmdevtools \ + meson \ + vala \ + gcc \ + pkgconfig \ + gtk4-devel \ + libadwaita-devel \ + glib2-devel \ + libgee-devel \ + libsecret-devel \ + ImageMagick \ + git \ + && dnf clean all + +# Create RPM build environment +RUN rpmdev-setuptree + +# Set working directory +WORKDIR /root/rpmbuild + +# Copy spec file +COPY dist/rpm/kordophone.spec SPECS/ + +# Build command +CMD ["rpmbuild", "-ba", "SPECS/kordophone.spec"] diff --git a/dist/rpm/kordophone.spec b/dist/rpm/kordophone.spec index 276d758..89cd731 100644 --- a/dist/rpm/kordophone.spec +++ b/dist/rpm/kordophone.spec @@ -5,7 +5,6 @@ Summary: GTK4/Libadwaita client for Kordophone License: GPL URL: https://git.sr.ht/~buzzert/kordophone-2-gtk -# Source0: %{name}-%{version}.tar.gz BuildRequires: meson >= 0.56.0 BuildRequires: vala @@ -47,4 +46,6 @@ fi %{_datadir}/icons/ %changelog -- Initial RPM package +* Fri Aug 8 2025 James Magahern +- Updated rpmspec + diff --git a/src/meson.build b/src/meson.build index f8b1e8e..12ade82 100644 --- a/src/meson.build +++ b/src/meson.build @@ -28,7 +28,7 @@ app_icon_dirs = [ build_tools_dir = meson.source_root() / 'build-aux' -image_magick = find_program('magick', required : true) +image_magick = find_program('convert', required : true) resizer = find_program(build_tools_dir / 'resize.py') icons = custom_target('icons', output: 'hicolor',