public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libmusicbrainz5] f43: Make package buildable in recent F44
@ 2026-06-12 10:56 Marcin Juszkiewicz
0 siblings, 0 replies; only message in thread
From: Marcin Juszkiewicz @ 2026-06-12 10:56 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/libmusicbrainz5
Branch : f43
Commit : d58e90f7f924967f3cdaa962dcdc2c47b815e9b4
Author : Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date : 2026-06-12T10:40:25+02:00
Stats : +50/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/libmusicbrainz5/c/d58e90f7f924967f3cdaa962dcdc2c47b815e9b4?branch=f43
Log:
Make package buildable in recent F44
- Bump CMake minimum version
- Fix ninja's complaints.
---
diff --git a/0003-src-CMakelists.txt-do-not-use-wildcards-for-dependen.patch b/0003-src-CMakelists.txt-do-not-use-wildcards-for-dependen.patch
new file mode 100644
index 0000000..a757741
--- /dev/null
+++ b/0003-src-CMakelists.txt-do-not-use-wildcards-for-dependen.patch
@@ -0,0 +1,23 @@
+From: Abderrahim Kitouni <a.kitouni@gmail.com>
+Date: Fri, 13 Apr 2018 09:56:57 +0100
+Subject: src/CMakelists.txt: do not use wildcards for dependencies
+
+This is discouraged by cmake's documentation and doesn't work with the ninja generator.
+---
+ src/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 68c04e3..f7439d3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -37,7 +37,8 @@ ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+ COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+- DEPENDS make-c-interface cinterface.xml *.inc
++ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc
++ c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc
+ )
+
+ ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
diff --git a/0004-Bump-minimum-CMake-version.patch b/0004-Bump-minimum-CMake-version.patch
new file mode 100644
index 0000000..3659dd7
--- /dev/null
+++ b/0004-Bump-minimum-CMake-version.patch
@@ -0,0 +1,18 @@
+From: Sebastian Ramacher <sramacher@debian.org>
+Date: Fri, 26 Sep 2025 11:11:12 +0200
+Subject: Bump minimum CMake version
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dfcb59a..08b1c1c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+
+ PROJECT(libmusicbrainz5)
+ SET(PROJECT_VERSION 5.1.0)
diff --git a/libmusicbrainz5.spec b/libmusicbrainz5.spec
index be005a3..ad626b1 100644
--- a/libmusicbrainz5.spec
+++ b/libmusicbrainz5.spec
@@ -6,7 +6,7 @@
Summary: Library for accessing MusicBrainz servers
Name: libmusicbrainz5
Version: 5.1.0
-Release: 29%{?dist}
+Release: 30%{?dist}
# Automatically converted from old format: LGPLv2 - review is highly recommended.
License: LicenseRef-Callaway-LGPLv2
URL: http://www.musicbrainz.org/
@@ -15,6 +15,8 @@ Source0: https://github.com/metabrainz/libmusicbrainz/releases/download/release-
Patch0: doxygen.patch
Patch1: 0001-Don-t-emit-errors-unless-compiled-for-debug.patch
Patch2: 0002-libxml2-2-12.patch
+Patch3: 0003-src-CMakelists.txt-do-not-use-wildcards-for-dependen.patch
+Patch4: 0004-Bump-minimum-CMake-version.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -43,6 +45,8 @@ applications which will use %{name}.
%patch -P0 -p1 -b .doxygen
%patch -P1 -p1 -b .silence-warnings
%patch -P2 -p1 -b .libxml2
+%patch -P3 -p1 -b .inc
+%patch -P4 -p1 -b .cmake
# omit "Generated on ..." timestamps that induce multilib conflicts
# this is *supposed* to be the doxygen default in fedora these days, but
@@ -79,6 +83,10 @@ rm -f docs/installdox
%changelog
+* Fri Jun 12 2026 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 5.1.0-30
+- Bump CMake minimum version
+- Fix ninja's complaints.
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-12 10:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-12 10:56 [rpms/libmusicbrainz5] f43: Make package buildable in recent F44 Marcin Juszkiewicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox