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/innoextract] rawhide:  - Allow to build with CMake 4.0 (rhbz#2380652)
Date: Wed, 29 Jul 2026 01:05:41 GMT	[thread overview]
Message-ID: <178528714189.1.9118318391332884309.rpms-innoextract-8694d3f27779@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/innoextract
            Branch : rawhide
            Commit : 8694d3f27779a3bd440b919632d7c680ca3ead93
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-07-22T22:35:30-03:00
            Stats  : +13/-16 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/innoextract/c/8694d3f27779a3bd440b919632d7c680ca3ead93?branch=rawhide

            Log:
            - Allow to build with CMake 4.0 (rhbz#2380652)
 - Use standard CMake macros (rhbz#2381024)
 - Fixes FTBFS in Fedora rawhide/f45 (rhbz#2504140)

thanks to Cristian Le <git@lecris.dev>

Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>

---
diff --git a/innoextract.spec b/innoextract.spec
index b66cb8e..72ce7f7 100644
--- a/innoextract.spec
+++ b/innoextract.spec
@@ -1,5 +1,3 @@
-%define __cmake_in_source_build 1
-#
 # spec file for package innoextract
 #
 # Copyright (c) 2012-2015 Daniel Scharrer <daniel@constexpr.org>
@@ -17,16 +15,16 @@
 Name:           innoextract
 Version:        1.9
 Release:        %autorelease
-License:        zlib
+License:        Zlib
 Summary:        Tool to extract installers created by Inno Setup
 Url:            https://constexpr.org/innoextract/
 Source:         %{url}/files/%{name}-%{version}.tar.gz
 Patch0:         innoextract-boost190.patch
-BuildRequires:  gcc-c++
-BuildRequires:  cmake
+
 BuildRequires:  boost-devel
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
 BuildRequires:  xz-devel
-BuildRequires: make
 
 %description
 Inno Setup is a tool to create installers for Microsoft Windows
@@ -34,20 +32,19 @@ applications. innoextract allows to extract such installers under
 non-windows systems without running the actual installer using wine.
 
 %prep
-%setup -q
-%patch 0 -p1
+%autosetup -p1
 
 %build
-%cmake \
-    -DCMAKE_INSTALL_DATAROOTDIR="%{_datadir}" \
-    -DCMAKE_INSTALL_MANDIR="%{_mandir}" \
-    -DCMAKE_INSTALL_BINDIR="%{_bindir}" \
-    -DUSE_LDGOLD=FALSE \
-    .
-make %{?_smp_mflags}
+# TODO: Please submit an issue to upstream (rhbz#2380652)
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+%cmake -DUSE_LDGOLD=FALSE
+%cmake_build
 
 %install
-%make_install
+%cmake_install
+
+%check
+%{buildroot}%{_bindir}/innoextract --version
 
 %files
 %license LICENSE

                 reply	other threads:[~2026-07-29  1:05 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=178528714189.1.9118318391332884309.rpms-innoextract-8694d3f27779@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