diff --git a/gedit-plugins.spec b/gedit-plugins.spec index 2369bcf..ddab32f 100644 --- a/gedit-plugins.spec +++ b/gedit-plugins.spec @@ -1,6 +1,6 @@ Name: gedit-plugins Version: 3.38.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plugins for gedit License: GPLv2+ @@ -12,10 +12,11 @@ BuildRequires: cairo-devel BuildRequires: gedit-devel BuildRequires: gettext BuildRequires: gtksourceview4-devel -BuildRequires: gucharmap-devel BuildRequires: itstool BuildRequires: libappstream-glib-devel +%if !0%{?rhel} BuildRequires: libgit2-glib-devel +%endif BuildRequires: libpeas-devel BuildRequires: meson BuildRequires: pygobject3-devel @@ -28,14 +29,18 @@ BuildRequires: yelp-tools # this is a metapackage dragging in all the plugins Requires: gedit-plugin-bookmarks Requires: gedit-plugin-bracketcompletion +%if !0%{?rhel} Requires: gedit-plugin-charmap +%endif Requires: gedit-plugin-codecomment Requires: gedit-plugin-colorpicker Requires: gedit-plugin-colorschemer Requires: gedit-plugin-commander Requires: gedit-plugin-drawspaces Requires: gedit-plugin-findinfiles +%if !0%{?rhel} Requires: gedit-plugin-git +%endif Requires: gedit-plugin-joinlines Requires: gedit-plugin-multiedit Requires: gedit-plugin-sessionsaver @@ -69,6 +74,7 @@ Requires: libpeas-loader-python3%{?_isa} %description -n gedit-plugin-bracketcompletion The gedit bracketcompletion plugin. +%if !0%{?rhel} %package -n gedit-plugin-charmap Summary: gedit charmap plugin Requires: %{name}-data = %{version}-%{release} @@ -76,6 +82,7 @@ Requires: gucharmap-libs Requires: libpeas-loader-python3%{?_isa} %description -n gedit-plugin-charmap The gedit charmap plugin. +%endif %package -n gedit-plugin-codecomment Summary: gedit codecomment plugin @@ -117,6 +124,7 @@ Requires: %{name}-data = %{version}-%{release} %description -n gedit-plugin-findinfiles The gedit findinfiles plugin. +%if !0%{?rhel} %package -n gedit-plugin-git Summary: gedit git plugin Requires: %{name}-data = %{version}-%{release} @@ -124,6 +132,7 @@ Requires: libgit2-glib Requires: libpeas-loader-python3%{?_isa} %description -n gedit-plugin-git The gedit git plugin. +%endif %package -n gedit-plugin-joinlines Summary: gedit joinlines plugin @@ -192,7 +201,12 @@ The gedit wordcompletion plugin. %autosetup -p1 %build -%meson +%meson \ +%if 0%{?rhel} + -Dplugin_charmap=false \ + -Dplugin_git=false \ +%endif + %nil %meson_build %install @@ -228,10 +242,12 @@ The gedit wordcompletion plugin. %{_libdir}/gedit/plugins/__pycache__/bracketcompletion.* %{_datadir}/metainfo/gedit-bracketcompletion.metainfo.xml +%if !0%{?rhel} %files -n gedit-plugin-charmap %{_libdir}/gedit/plugins/charmap %{_libdir}/gedit/plugins/charmap.plugin %{_datadir}/metainfo/gedit-charmap.metainfo.xml +%endif %files -n gedit-plugin-codecomment %{_libdir}/gedit/plugins/codecomment.* @@ -266,10 +282,12 @@ The gedit wordcompletion plugin. %{_libdir}/gedit/plugins/libfindinfiles.so %{_datadir}/metainfo/gedit-findinfiles.metainfo.xml +%if !0%{?rhel} %files -n gedit-plugin-git %{_libdir}/gedit/plugins/git %{_libdir}/gedit/plugins/git.plugin %{_datadir}/metainfo/gedit-git.metainfo.xml +%endif %files -n gedit-plugin-joinlines %{_libdir}/gedit/plugins/joinlines.* @@ -321,6 +339,9 @@ The gedit wordcompletion plugin. %{_datadir}/metainfo/gedit-wordcompletion.metainfo.xml %changelog +* Fri Feb 05 2021 Kalev Lember - 3.38.1-3 +- Don't build gedit-plugin-charmap and gedit-plugin-git for RHEL + * Tue Jan 26 2021 Fedora Release Engineering - 3.38.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild