diff --git a/SOURCES/0005-Ensure-that-the-right-version-of-Gtk-gets-loaded.patch b/SOURCES/0005-Ensure-that-the-right-version-of-Gtk-gets-loaded.patch new file mode 100644 index 0000000..f7e1a70 --- /dev/null +++ b/SOURCES/0005-Ensure-that-the-right-version-of-Gtk-gets-loaded.patch @@ -0,0 +1,36 @@ +From ab4c282729847338e97d236342d21fabd7cfb3aa Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Mon, 24 Aug 2015 10:28:39 +0200 +Subject: [PATCH] Ensure that the right version of Gtk gets loaded + +As suggested by PyGIWarning: + + /usr/lib/python3.4/site-packages/pyfros/controls.py:22: PyGIWarning: + Gtk was imported without specifying a version first. Use + gi.require_version('Gtk', '3.0') before import to ensure that the + right version gets loaded. + from gi.repository import Gtk + +Signed-off-by: Jakub Filak +--- + src/pyfros/controls.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/pyfros/controls.py b/src/pyfros/controls.py +index 0593ef7..b64cf8b 100644 +--- a/src/pyfros/controls.py ++++ b/src/pyfros/controls.py +@@ -15,6 +15,10 @@ + ## along with this program; if not, write to the Free Software + ## Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA + ++# As suggested by a PyGIWarning ++import gi ++gi.require_version('Gtk', '3.0') ++ + # pylint has troubles importing from gi.repository because + # it uses introspection + # pylint: disable=E0611 +-- +2.5.0 + diff --git a/SPECS/fros.spec b/SPECS/fros.spec index 6d07084..188efcc 100644 --- a/SPECS/fros.spec +++ b/SPECS/fros.spec @@ -1,6 +1,6 @@ Name: fros Version: 1.0 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Universal screencasting frontend with pluggable support for various backends %global commit 60d9d1c5578cd32f29ce85afbe4f6c543a97b313 @@ -13,24 +13,20 @@ URL: https://github.com/mozeq/fros Source: https://github.com/mozeq/fros/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0005: 0005-Ensure-that-the-right-version-of-Gtk-gets-loaded.patch + BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools +Obsoletes: fros-recordmydesktop < 1.0-3 + %description Universal screencasting frontend with pluggable support for various backends. The goal is to provide an unified access to as many screencasting backends as possible while still keeping the same user interface so the user experience while across various desktops and screencasting programs is seamless. -%package recordmydesktop -Summary: fros plugin for screencasting using recordmydesktop as a backend -Group: Applications/System -Requires: %{name} = %{version}-%{release} - -%description recordmydesktop -fros plugin for screencasting using recordmydesktop as a backend - %package gnome Summary: fros plugin for screencasting using Gnome3 integrated screencaster Group: Applications/System @@ -42,6 +38,8 @@ fros plugin for screencasting using Gnome3 integrated screencaster %prep %setup -qn %{name}-%{commit} +%patch5 -p1 + %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build @@ -59,19 +57,27 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %dir %{python_sitelib}/pyfros/plugins %{python_sitelib}/pyfros/plugins/__init__.* %{python_sitelib}/pyfros/plugins/const.* +%exclude %{python_sitelib}/pyfros/plugins/*recordmydesktop.* # fros-1.0-py2.7.egg-info %dir %{python_sitelib}/%{name}-%{version}-py2.7.egg-info %{python_sitelib}/%{name}-%{version}-py2.7.egg-info/* %{_bindir}/fros %{_mandir}/man1/%{name}.1* -%files recordmydesktop -%{python_sitelib}/pyfros/plugins/*recordmydesktop.* - %files gnome %{python_sitelib}/pyfros/plugins/*gnome.* %changelog +* Tue Jan 15 2019 Ernestas Kulik - 1.0-5 +- Fix Obsoletes line + +* Tue Dec 18 2018 Ernestas Kulik - 1.0-4 +- Add Obsoletes line to fix installation problems when upgrading + +* Mon Nov 19 2018 Ernestas Kulik - 1.0-3 +- Drop recordmydesktop sub-package (rhbz#1647170) +- Load version 3.0 of Gtk namespace, silence a PyGObject warning (rhbz#1647170) + * Fri Dec 27 2013 Daniel Mach - 1.0-2 - Mass rebuild 2013-12-27