From 678c51fcee652d86492dce99d5ccd84df94c468c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 10 May 2022 02:59:27 -0400 Subject: [PATCH] import libgit2-glib-0.26.4-3.el8 --- SPECS/libgit2-glib.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/SPECS/libgit2-glib.spec b/SPECS/libgit2-glib.spec index cede67f..cf15280 100644 --- a/SPECS/libgit2-glib.spec +++ b/SPECS/libgit2-glib.spec @@ -3,7 +3,7 @@ Name: libgit2-glib Version: 0.26.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git library for GLib License: LGPLv2+ @@ -23,6 +23,7 @@ BuildRequires: pkgconfig(libgit2) >= %{libgit2_version} BuildRequires: pkgconfig(pygobject-3.0) BuildRequires: python3-devel BuildRequires: vala +BuildRequires: multilib-rpm-config Requires: glib2%{?_isa} >= %{glib2_version} Requires: libgit2%{?_isa} >= %{libgit2_version} @@ -58,6 +59,10 @@ developing applications that use %{name}. mkdir -p %{buildroot}%{_docdir}/%{name} install -p -m 0644 -t %{buildroot}%{_docdir}/%{name} %{SOURCE1} +# Fix devel header that has arch-specific comment in it +%multilib_fix_c_header --file %{_includedir}/libgit2-glib-1.0/libgit2-glib/ggit-enum-types.h + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -78,6 +83,10 @@ install -p -m 0644 -t %{buildroot}%{_docdir}/%{name} %{SOURCE1} %doc %{_datadir}/gtk-doc/ %changelog +* Wed Sep 08 2021 Brian C. Lane - 0.26.4-3 +- Fix multilib conflict in ggit-enum-types.h + Resolves: rhbz#1853150 + * Wed Aug 15 2018 Brian C. Lane - 0.26.4-2 - Remove BuildRequires for libssh2-devel Resolves: rhbz#1616335