.gitignore

@@ -1 +1 @@
-SOURCES/libgit2-glib-1.1.0.tar.xz
+SOURCES/libgit2-glib-0.26.4.tar.xz

.libgit2-glib.metadata

@@ -1 +1 @@
-d8541c2149bd4892a90b7ff7938559012a278ea6 SOURCES/libgit2-glib-1.1.0.tar.xz
+aa71685615af8187c1dabcbfd403532519f87141 SOURCES/libgit2-glib-0.26.4.tar.xz

SOURCES/README.rhel8

@@ -0,0 +1,2 @@
+This version of libgit2-glib is built without ssh support.  libssh2 is not shipped
+with RHEL 8 so the 'ssh' flag has been set to false in the build.

SOURCES/libgit2-glib-0.26.4-meson.build.patch

@@ -0,0 +1,12 @@
+diff -up libgit2-glib-0.26.4/meson.build.orig libgit2-glib-0.26.4/meson.build
+--- libgit2-glib-0.26.4/meson.build.orig	2018-03-02 04:51:47.000000000 -0500
++++ libgit2-glib-0.26.4/meson.build	2018-06-18 10:43:19.459021647 -0400
+@@ -131,8 +131,6 @@ enable_vapi = get_option('vapi')
+ if enable_vapi
+   assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.')
+   assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.')
+-
+-  meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir)
+ endif
+ 
+ # Check for libgit2 ssh support

SPECS/libgit2-glib.spec

@@ -1,26 +1,36 @@
-%global libgit2_version 0.25.0
 %global glib2_version 2.44.0
+%global libgit2_version 0.26.0
 
 Name:           libgit2-glib
-Version:        1.1.0
+Version:        0.26.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Git library for GLib
 
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/Libgit2-glib
-Source0:        https://download.gnome.org/sources/libgit2-glib/1.1/libgit2-glib-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/libgit2-glib/0.26/libgit2-glib-%{version}.tar.xz
+Source1:        README.rhel8
 
+Patch0:         libgit2-glib-0.26.4-meson.build.patch
+
+BuildRequires:  gtk-doc
 BuildRequires:  gcc
-BuildRequires:  gi-docgen
 BuildRequires:  meson
-BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(gobject-2.0) >= %{glib2_version}
+BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(gio-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(libgit2) >= %{libgit2_version}
-BuildRequires:  libssh2-devel
 BuildRequires:  pkgconfig(pygobject-3.0)
 BuildRequires:  python3-devel
 BuildRequires:  vala
+BuildRequires:  multilib-rpm-config
+
+Requires:       glib2%{?_isa} >= %{glib2_version}
+Requires:       libgit2%{?_isa} >= %{libgit2_version}
+# Depend on python3-gobject for the python3 gi overrides directory.
+# If we ever get a libgit2-glib consumer that does not depend on python3,
+# it would probably make sense to split it to a separate subpackage.
+Requires:       python3-gobject%{?_isa}
 
 %description
 libgit2-glib is a glib wrapper library around the libgit2 git access library.
@@ -38,21 +48,31 @@ developing applications that use %{name}.
 
 %build
 %meson -Dgtk_doc=true \
-       -Dpython=true
+       -Dintrospection=true \
+       -Dpython=true \
+       -Dssh=false
 
 %meson_build
 
 %install
 %meson_install
+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
 
 %files
 %license COPYING
 %doc AUTHORS NEWS
-%{_libdir}/libgit2-glib-1.0.so.0{,.*}
+%doc %{_docdir}/%{name}/README.rhel8
+%{_libdir}/libgit2-glib-1.0.so.*
 %{_libdir}/girepository-1.0/Ggit-1.0.typelib
-%dir %{python3_sitearch}/gi
+%{python3_sitelib}/gi/overrides/*
-%dir %{python3_sitearch}/gi/overrides
-%{python3_sitearch}/gi/overrides/*
 
 %files devel
 %{_includedir}/libgit2-glib-1.0/
@@ -63,99 +83,19 @@ developing applications that use %{name}.
 %doc %{_datadir}/gtk-doc/
 
 %changelog
-* Mon Aug 08 2022 Kalev Lember <klember@redhat.com> - 1.1.0-1
+* Wed Sep 08 2021 Brian C. Lane <bcl@redhat.com> - 0.26.4-3
-- Update to 1.1.0
+- Fix multilib conflict in ggit-enum-types.h
+  Resolves: rhbz#1853150
 
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.1-4
+* Wed Aug 15 2018 Brian C. Lane <bcl@redhat.com> - 0.26.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+- Remove BuildRequires for libssh2-devel
+  Resolves: rhbz#1616335
 
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.0.1-3
+* Tue Jul 17 2018 Brian C. Lane <bcl@redhat.com> - 0.26.4-1
-- Rebuilt for Python 3.11
+- Update to libgit2-glib-0.26.4
-
+- Switch to using meson build system
-* Sun Feb 20 2022 Igor Raits <igor.raits@gmail.com> - 1.0.0.1-2
+- Disable SSH so that libssh2 is not required
-- Rebuild for libgit2 1.4.x
+- Add README.rhel8 explaining why SSH is disabled
-
-* Thu Jan 20 2022 David King <amigadave@amigadave.com> - 1.0.0.1-1
-- Update to 1.0.0.1
-
-* Sun Nov 28 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.99.0.1-10
-- Rebuild for libgit2 1.3.x
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.0.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.99.0.1-8
-- Rebuilt for Python 3.10
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.0.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Dec 28 19:00:21 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.99.0.1-6
-- Rebuild for libgit2 1.1.x
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 0.99.0.1-4
-- Rebuilt for Python 3.9
-
-* Wed Apr 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.99.0.1-3
-- Rebuild against libgit2 1.0.0
-
-* Tue Mar 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.99.0.1-2
-- Rebuild for libgit2 0.99
-
-* Tue Mar 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.99.0.1-1
-- Update to 0.99.0.1
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.28.0.1-5
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 0.28.0.1-4
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 06 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.28.0.1-2
-- Rebuild for libgit2 0.28.x
-
-* Thu May 09 2019 Kalev Lember <klember@redhat.com> - 0.28.0.1-1
-- Update to 0.28.0.1
-
-* Wed Feb 13 2019 Kalev Lember <klember@redhat.com> - 0.27.8-1
-- Update to 0.27.8
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.27.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Nov 04 2018 Pete Walter <pwalter@fedoraproject.org> - 0.27.7-1
-- Update to 0.27.7
-
-* Fri Aug 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.26.4-4
-- Add compatibility with libgit2 0.27.x
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 0.26.4-2
-- Rebuilt for Python 3.7
-
-* Fri Mar 02 2018 Kalev Lember <klember@redhat.com> - 0.26.4-1
-- Update to 0.26.4
-- Switch to the meson build system
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.26.2-2
-- Switch to %%ldconfig_scriptlets
-
-* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 0.26.2-1
-- Update to 0.26.2
 
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild