From e2c72fbc007ef837941ebc85eebfd3b7cef02d5b Mon Sep 17 00:00:00 2001 From: Oliver Haessler Date: Nov 24 2016 08:45:50 +0000 Subject: Adjust requires for python(2)-psutil for EPEL --- diff --git a/terminator-fix-NewWindow-issue.patch b/terminator-fix-NewWindow-issue.patch new file mode 100644 index 0000000..787f748 --- /dev/null +++ b/terminator-fix-NewWindow-issue.patch @@ -0,0 +1,11 @@ +--- data/terminator.desktop.in 2011-08-22 20:42:49.000000000 +0200 ++++ data/terminator.desktop.in.fedora 2011-09-24 16:08:40.000000000 +0200 +@@ -9,7 +9,7 @@ + StartupNotify=true + X-Ubuntu-Gettext-Domain=terminator + X-Ayatana-Desktop-Shortcuts=NewWindow; +-[NewWindow Shortcut Group] ++[X-NewWindow Shortcut Group] + Name=Open a New Window + Exec=terminator + TargetEnvironment=Unity diff --git a/terminator.spec b/terminator.spec index 022b6b5..cba9bee 100644 --- a/terminator.spec +++ b/terminator.spec @@ -13,14 +13,15 @@ Source0: https://launchpad.net/terminator/gtk3/1.9/+download/terminator-% BuildArch: noarch BuildRequires: python-devel gettext desktop-file-utils intltool +Requires: vte3 gnome-python2-gconf GConf2 gtk3 desktop-file-utils +Requires: gnome-python2-bonobo python-keybinder + %if 0%{?rhel} -Requires: python-psutil +Requires: python-psutil %else -Requires: python2-psutil +Requires: python2-psutil %endif -Requires: vte3 gnome-python2-gconf GConf2 gtk3 desktop-file-utils -Requires: gnome-python2-bonobo python-keybinder Patch0: terminator-fix-NewWindow-issue.patch @@ -85,10 +86,8 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : %changelog -* Wed Nov 23 2016 Oliver Haessler - 1.90-2 -- New Upstream Release: Terminator 1.90 -- changed Require of python-psutils to seperate Fedora and EPEL - (as python2-psutils is only available in Fedora) +* Thu Nov 24 2016 Dominic Hopf - 1.90-2 +- Adjust requires for python(2)-psutil for EPEL * Wed Nov 23 2016 Dominic Hopf - 1.90-1 - New Upstream Release: Terminator 1.90