Drop non-functional python2 support

This commit is contained in:
Ray Strode 2017-12-08 13:32:06 -05:00
parent ecdd6f6762
commit 4801bf1775

View File

@ -1,24 +1,19 @@
%if 0%{?fedora} > 12 %if 0%{?fedora} > 12
%global with_zeitgeist 1 %global with_zeitgeist 1
%global with_python3 1
%else %else
%global with_zeitgeist 0 %global with_zeitgeist 0
%global with_python3 0
%endif %endif
%if %{with_python3}
%global __python %{__python3} %global __python %{__python3}
%endif
Name: gedit-plugins Name: gedit-plugins
Version: 3.22.0 Version: 3.22.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: Plugins for gedit Summary: Plugins for gedit
License: GPLv2+ License: GPLv2+
URL: https://wiki.gnome.org/Apps/Gedit URL: https://wiki.gnome.org/Apps/Gedit
Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
Patch0: gedit-plugins-disable-python3.patch
BuildRequires: gedit-devel BuildRequires: gedit-devel
BuildRequires: gnome-doc-utils BuildRequires: gnome-doc-utils
@ -27,12 +22,8 @@ BuildRequires: perl(XML::Parser)
BuildRequires: gettext BuildRequires: gettext
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: atk-devel BuildRequires: atk-devel
%if %{with_python3}
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-gobject BuildRequires: python3-gobject
%else
BuildRequires: python-devel
%endif
BuildRequires: pygobject3-devel BuildRequires: pygobject3-devel
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libpeas-devel BuildRequires: libpeas-devel
@ -77,9 +68,7 @@ A collection of plugins for gedit.
%package data %package data
Summary: Common data required by plugins Summary: Common data required by plugins
Requires: gedit Requires: gedit
%if %{with_python3}
Requires: python3-gobject >= %{pygo_version} Requires: python3-gobject >= %{pygo_version}
%endif
%description data %description data
Common files required by all plugins. Common files required by all plugins.
@ -222,9 +211,6 @@ The gedit zeitgeist plugin.
%prep %prep
%setup -q %setup -q
%if !%{with_python3}
%patch0 -p1 -b .disable-python3
%endif
%build %build
%if %{with_zeitgeist} %if %{with_zeitgeist}
@ -390,6 +376,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%endif %endif
%changelog %changelog
* Fri Dec 08 2017 Ray Strode <rstrode@redhat.com> - 3.22.0-5
- Drop non-functional python2 support
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.0-4 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild