[rpms/createrepo_c] rawhide: Disable modularity on RHEL >= 11

[rpms/createrepo_c] rawhide: Disable modularity on RHEL >= 11

[@ 2026-07-08 15:22 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/createrepo_c
Branch : rawhide
Commit : 6d91e13f1c8f8e1296e4140e90aca9b1dcce3633
Author : Petr Písař <ppisar@redhat.com>
Date   : 2026-07-08T17:21:56+02:00
Stats  : +79/-1 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/createrepo_c/c/6d91e13f1c8f8e1296e4140e90aca9b1dcce3633?branch=rawhide

Log:
Disable modularity on RHEL >= 11

---
diff --git a/0011-doc-Omit-modularity-related-texts-if-built-without-m.patch b/0011-doc-Omit-modularity-related-texts-if-built-without-m.patch
new file mode 100644
index 0000000..67163a5
--- /dev/null
+++ b/0011-doc-Omit-modularity-related-texts-if-built-without-m.patch
@@ -0,0 +1,50 @@
+From 681106422208da62008f48456656f699d91e7178 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 6 Mar 2026 13:22:28 +0100
+Subject: [PATCH 8/9] doc: Omit modularity-related texts if built without
+ modularity support
+
+---
+ doc/CMakeLists.txt    | 5 +++++
+ doc/createrepo_c.8.in | 2 ++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 6f523e6..6cc635f 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -20,6 +20,11 @@ IF(ENABLE_DRPM)
+ ELSE()
+     SET(ENABLE_DRPM_MAN 0)
+ ENDIF()
++IF(WITH_LIBMODULEMD)
++    SET(WITH_LIBMODULEMD_MAN 1)
++ELSE()
++    SET(WITH_LIBMODULEMD_MAN 0)
++ENDIF()
+ CONFIGURE_FILE(createrepo_c.8.in ${CMAKE_CURRENT_BINARY_DIR}/createrepo_c.8 @ONLY)
+ 
+ IF(CREATEREPO_C_INSTALL_MANPAGES)
+diff --git a/doc/createrepo_c.8.in b/doc/createrepo_c.8.in
+index 539e603..217ce20 100644
+--- a/doc/createrepo_c.8.in
++++ b/doc/createrepo_c.8.in
+@@ -38,6 +38,7 @@ createrepo_c [options] <directory>
+ .SH DESCRIPTION
+ .sp
+ Uses rpm packages from <directory> to create repodata.
++.if @WITH_LIBMODULEMD_MAN@ \{\
+ .sp
+ If compiled with libmodulemd support modular metadata inside <directory> identified by the patterns below and all their compressed variants are automatically collected, merged and added to the repodata.
+ .sp
+@@ -54,6 +55,7 @@ modules.yaml (recommended way of importing multiple documents at once)
+ .UNINDENT
+ .UNINDENT
+ .UNINDENT
++.\}
+ .SH OPTIONS
+ .SS \-V \-\-version
+ .sp
+-- 
+2.55.0
+

diff --git a/0012-spec-Disable-modularity-from-RHEL-11.patch b/0012-spec-Disable-modularity-from-RHEL-11.patch
new file mode 100644
index 0000000..1c3935b
--- /dev/null
+++ b/0012-spec-Disable-modularity-from-RHEL-11.patch
@@ -0,0 +1,25 @@
+From 843c0e4fd0e11fea4219cf5c55ca952edfdab6d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Tue, 3 Mar 2026 10:33:57 +0100
+Subject: [PATCH 9/9] spec: Disable modularity from RHEL 11
+
+---
+ createrepo_c.spec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/createrepo_c.spec b/createrepo_c.spec
+index 96d4de1..f2a1014 100644
+--- a/createrepo_c.spec
++++ b/createrepo_c.spec
+@@ -21,7 +21,7 @@
+ %bcond_without zchunk
+ %endif
+ 
+-%if 0%{?rhel} && 0%{?rhel} < 7
++%if 0%{?rhel} && ( 0%{?rhel} < 7 || 0%{?rhel} >= 11 )
+ %bcond_with libmodulemd
+ %else
+ %bcond_without libmodulemd
+-- 
+2.55.0
+

diff --git a/createrepo_c.spec b/createrepo_c.spec
index 579714f..84149c2 100644
--- a/createrepo_c.spec
+++ b/createrepo_c.spec
@@ -18,7 +18,7 @@
 %bcond_without zchunk
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && ( 0%{?rhel} < 7 || 0%{?rhel} >= 11 )
 %bcond_with libmodulemd
 %else
 %bcond_without libmodulemd
@@ -55,6 +55,8 @@ Patch7:         0007-spec-Consistently-use-CMake-RPM-macros.patch
 Patch8:         0008-cmake-Allow-builds-without-Doxygen-being-present-wit.patch
 Patch9:         0009-Make-building-of-doxygen-based-C-API-docs-configurab.patch
 Patch10:        0010-Omit-delta-rpm-related-info-from-bash-completion-and.patch
+Patch11:        0011-doc-Omit-modularity-related-texts-if-built-without-m.patch
+Patch12:        0012-spec-Disable-modularity-from-RHEL-11.patch
 
 %global epoch_dep %{?epoch:%{epoch}:}
 
@@ -227,6 +229,7 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
 * Wed Jul 08 2026 Petr Pisar <ppisar@redhat.com> - 1.2.1-8
 - Omit delta RPM from bash completion and manual pages if built without delta
   RPM support
+- Disable modularity on RHEL >= 11
 
 * Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.1-7
 - Rebuilt for openssl 4.0