public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Than Ngo <than@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/automoc] rawhide: Fix rhbz#2503779, FTBFS with cmake4
Date: Mon, 10 Aug 2026 19:12:44 GMT [thread overview]
Message-ID: <178638916433.1.11280575340948006000.rpms-automoc-581212c2a397@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/automoc
Branch : rawhide
Commit : 581212c2a39746237d0418bf84b31eadfc1e25b9
Author : Than Ngo <than@redhat.com>
Date : 2026-08-10T21:12:25+02:00
Stats : +30/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/automoc/c/581212c2a39746237d0418bf84b31eadfc1e25b9?branch=rawhide
Log:
Fix rhbz#2503779, FTBFS with cmake4
---
diff --git a/automoc-cmake4.patch b/automoc-cmake4.patch
new file mode 100644
index 0000000..ae27338
--- /dev/null
+++ b/automoc-cmake4.patch
@@ -0,0 +1,25 @@
+diff -up automoc4-0.9.88/Automoc4Config.cmake.me automoc4-0.9.88/Automoc4Config.cmake
+--- automoc4-0.9.88/Automoc4Config.cmake.me 2026-08-10 20:08:43.989636422 +0200
++++ automoc4-0.9.88/Automoc4Config.cmake 2026-08-10 20:09:18.818672279 +0200
+@@ -56,10 +56,10 @@ if(COMMAND cmake_policy)
+ endif(COMMAND cmake_policy)
+
+ # 2.6.4 is required because of the get_filename_component(REALPATH)
+-cmake_minimum_required( VERSION 2.6.4 FATAL_ERROR )
++cmake_minimum_required(VERSION 2.6.4...3.5)
+
+ # allow duplicate target names, this is also done in FindKDE4Internal.cmake
+-cmake_policy(SET CMP0002 OLD)
++cmake_policy(SET CMP0002 NEW)
+
+ get_filename_component(_AUTOMOC4_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+diff -up automoc4-0.9.88/CMakeLists.txt.me automoc4-0.9.88/CMakeLists.txt
+--- automoc4-0.9.88/CMakeLists.txt.me 2026-08-10 20:42:40.013865152 +0200
++++ automoc4-0.9.88/CMakeLists.txt 2026-08-10 20:43:02.721354091 +0200
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.9...3.5)
+ project(Automoc4)
+
+ include(CTest)
diff --git a/automoc.spec b/automoc.spec
index 96bb6f1..7c5e4e3 100644
--- a/automoc.spec
+++ b/automoc.spec
@@ -7,7 +7,7 @@
Name: automoc
Version: 1.0
-Release: 0.54.%{?beta_tag}%{?dist}
+Release: 0.55.%{?beta_tag}%{?dist}
Summary: Automatic moc for Qt 4
License: BSD-2-Clause
URL: http://www.kde.org
@@ -47,6 +47,7 @@ Patch30: 0030-Don-t-attempt-to-read-the-DEFINITIONS-property.patch
Patch31: 0031-Don-t-attempt-to-add-dependencies-which-do-not-exist.patch
Patch32: 0032-set-cmake_min_req-to-enable-newer-policies.patch
Patch33: 0033-cmake-2.8.9-sets-CMP0003-to-NEW-clean-up.patch
+Patch34: automoc-cmake4.patch
Provides: automoc4 = %{beta}
@@ -88,6 +89,9 @@ make install DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Mon Aug 10 2026 Than Ngo <than@redhat.com> - 1.0-0.55.rc3
+- Fix rhbz#2503779, FTBFS with cmake4
+
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.54.rc3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
reply other threads:[~2026-08-10 19:12 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=178638916433.1.11280575340948006000.rpms-automoc-581212c2a397@fedoraproject.org \
--to=than@redhat.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