public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mariadb-connector-c] f44: Drop multilib-rpm-config usage on RHEL
@ 2026-06-25 18:19 Michal Schorm
  0 siblings, 0 replies; only message in thread
From: Michal Schorm @ 2026-06-25 18:19 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/mariadb-connector-c
            Branch : f44
            Commit : 85b7d52a91aa7617bff196cadaa81ed77741f771
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-05-21T13:40:18+02:00
            Stats  : +9/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/mariadb-connector-c/c/85b7d52a91aa7617bff196cadaa81ed77741f771?branch=f44

            Log:
            Drop multilib-rpm-config usage on RHEL

multilib was dropped completely as of RHEL 10, and the macros are
expected to be dropped from RHEL 11.

Related: RHEL-178013
Related: https://github.com/fedora-eln/eln/issues/525

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec
index f958e31..ed133f5 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -7,7 +7,7 @@
 
 Name:           mariadb-connector-c
 Version:        3.4.8
-Release:        3%{?with_debug:.debug}%{?dist}
+Release:        4%{?with_debug:.debug}%{?dist}
 Summary:        The MariaDB Native Client library (C driver)
 License:        LGPL-2.1-or-later AND PHP-3.0 AND PHP-3.01
 Source:         https://archive.mariadb.org/connector-c-%{version}/%{name}-%{version}-src.tar.gz
@@ -42,7 +42,7 @@ Summary:        Development files for mariadb-connector-c
 Requires:       %{name} = %{version}-%{release}
 Recommends:     %{name}-doc = %{version}-%{release}
 Requires:       openssl-devel zlib-devel
-BuildRequires:  multilib-rpm-config
+%{!?rhel:BuildRequires:  multilib-rpm-config}
 Conflicts:      mysql-devel-any
 
 %description devel
@@ -152,7 +152,9 @@ sed -e 's|@SYSCONFDIR@|%{_sysconfdir}|' %{SOURCE2} > my.cnf
 %install
 %cmake_install
 
+%if %{undefined rhel}
 %multilib_fix_c_header --file %{_includedir}/mysql/mariadb_version.h
+%endif
 
 # Remove static linked libraries and symlinks to them
 rm %{buildroot}%{_libdir}/lib*.a
@@ -269,6 +271,11 @@ install -D -p -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{nam
 #      Need to ensure, that the testsuite will also run properly on 'fedpkg local' buid, not damaging the host machine
 
 %changelog
+* Thu May 21 2026 Michal Schorm <mschorm@redhat.com> - 3.4.8-4
+- Drop multilib-rpm-config usage on RHEL
+  Related: RHEL-178013
+  Related: https://github.com/fedora-eln/eln/issues/525
+
 * Sat Jan 24 2026 Michal Schorm <mschorm@redhat.com> - 3.4.8-3
 - Fedora 44 change: Remove 'community-mysql' names
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-25 18:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-25 18:19 [rpms/mariadb-connector-c] f44: Drop multilib-rpm-config usage on RHEL Michal Schorm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox