FTBFS fixes for Rawhide and ELN

Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
This commit is contained in:
Merlin Mathesius 2020-08-05 13:42:21 -05:00
parent 428b7295a2
commit 8ed0488188
2 changed files with 19 additions and 4 deletions

View File

@ -1,7 +1,3 @@
# This package depends on automagic byte compilation
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
%global _python_bytecompile_extra 1
%global __python %{__python3}
%global glib2_version 2.64
@ -26,6 +22,9 @@ Source0: https://download.gnome.org/sources/%{name}/3.37/%{name}-%{version}.tar.
# https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/252#note_742198
Patch1: restore-overlay-scrollbars.patch
# Override meson default change so Gedit.py installs to %%{python3_sitearch}
# as expected (instead of %%{python3_sitelib})
Patch2: python3-install-path-fix.patch
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
@ -107,6 +106,8 @@ Install gedit-devel if you want to write plugins for gedit.
%install
%meson_install
%py_byte_compile %{__python3} %{buildroot}%{python3_sitearch}/gi/overrides
%py_byte_compile %{__python3} %{buildroot}%{_libdir}/gedit/plugins/snippets
%find_lang %{name} --with-gnome
@ -170,6 +171,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
%{_datadir}/vala/
%changelog
* Wed Aug 05 2020 Merlin Mathesius <mmathesi@redhat.com> - 2:3.37.2-3
- FTBFS fixes for Rawhide and ELN
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.37.2-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -0,0 +1,11 @@
diff -ru ../gedit-3.37.2.orig/gedit/meson.build ./gedit/meson.build
--- ../gedit-3.37.2.orig/gedit/meson.build 2020-05-29 07:52:21.783929300 -0500
+++ ./gedit/meson.build 2020-08-05 13:16:53.212282203 -0500
@@ -199,6 +199,7 @@
python3.install_sources(
'Gedit.py',
+ pure: false,
subdir: 'gi/overrides',
)