diff --git a/0007-Add-a-sanity-check-to-recordmydestkop-plugin.patch b/0007-Add-a-sanity-check-to-recordmydestkop-plugin.patch deleted file mode 100644 index 567498b..0000000 --- a/0007-Add-a-sanity-check-to-recordmydestkop-plugin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 915a63da5e94f85a8f0a211c73f9fafa77bc31f4 Mon Sep 17 00:00:00 2001 -From: Jakub Filak -Date: Mon, 24 Aug 2015 15:26:03 +0200 -Subject: [PATCH] Add a sanity check to 'recordmydestkop' plugin - -Related: rhbz#1228860 - -Signed-off-by: Jakub Filak ---- - src/pyfros/plugins/screencastrecordmydesktop.py | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/pyfros/plugins/screencastrecordmydesktop.py b/src/pyfros/plugins/screencastrecordmydesktop.py -index 376b52b..63efd7d 100644 ---- a/src/pyfros/plugins/screencastrecordmydesktop.py -+++ b/src/pyfros/plugins/screencastrecordmydesktop.py -@@ -17,14 +17,14 @@ - - from pyfros.screencastbase import ScreencastBase, ScreencastResult - import pyfros.plugins.const as const --from subprocess import Popen, PIPE -+from subprocess import Popen, PIPE, DEVNULL - import fcntl - import os - import signal - #pylint: disable=E0611 - from gi.repository import GLib - import re --from pyfros.froslogging import warn -+from pyfros.froslogging import warn, error - - - def getScreencastPluginInstance(): -@@ -95,6 +95,13 @@ class ScreencastRecordMyDesktop(ScreencastBase): - print("ScreencastArea ScreencastRecordMyDesktop") - - def IsSuitable(self): -+ try: -+ proc = Popen(["recordmydesktop", "-h"], stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL) -+ proc.communicate() -+ except Exception as ex: -+ error("Cannot run 'recordmydesktop': %s" % (str(ex))) -+ return const.SUITABLE_NOT_SUITABLE -+ - return const.SUITABLE_DEFAULT # 1 is default - - def Screencast(self): --- -2.5.0 - diff --git a/fros.spec b/fros.spec index 9ab04ba..49b267c 100644 --- a/fros.spec +++ b/fros.spec @@ -1,6 +1,6 @@ Name: fros Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Universal screencasting frontend with pluggable support for various backends %global commit 30275a07dab7891b9f31ff115743f67d757c7c1a @@ -20,7 +20,6 @@ Patch0002: 0002-Specify-prototypes-for-used-X11-C-functions.patch Patch0004: 0004-Switch-to-XDG_CURRENT_DESKTOP.patch Patch0005: 0005-Ensure-that-the-right-version-of-Gtk-gets-loaded.patch Patch0006: 0006-Delay-initialization-of-GNOME-Screencast-D-Bus-proxy.patch -Patch0007: 0007-Add-a-sanity-check-to-recordmydestkop-plugin.patch BuildArch: noarch @@ -38,14 +37,6 @@ 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 @@ -82,24 +73,25 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %dir %{python3_sitelib}/pyfros/plugins %{python3_sitelib}/pyfros/plugins/__init__.* %{python3_sitelib}/pyfros/plugins/const.* +%exclude %{python3_sitelib}/pyfros/plugins/screencastrecordmydesktop.py %dir %{python3_sitelib}/pyfros/plugins/__pycache__ %{python3_sitelib}/pyfros/plugins/__pycache__/__init__.cpython-%{python3_version_nodots}*.py* %{python3_sitelib}/pyfros/plugins/__pycache__/const.cpython-%{python3_version_nodots}*.py* +%exclude %{python3_sitelib}/pyfros/plugins/__pycache__/screencastrecordmydesktop.cpython-%{python3_version_nodots}*.py* # fros-1.0-py2.7.egg-info %dir %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info/* %{_bindir}/fros %{_mandir}/man1/%{name}.1* -%files recordmydesktop -%{python3_sitelib}/pyfros/plugins/*recordmydesktop.* -%{python3_sitelib}/pyfros/plugins/__pycache__/*recordmydesktop.cpython-%{python3_version_nodots}.*py* - %files gnome %{python3_sitelib}/pyfros/plugins/*gnome.* %{python3_sitelib}/pyfros/plugins/__pycache__/*gnome.cpython-%{python3_version_nodots}.*py* %changelog +* Mon Nov 19 2018 Ernestas Kulik - 1.1-16 +- Drop recordmydesktop sub-package. + * Wed Feb 07 2018 Fedora Release Engineering - 1.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild