From 35cd63d5c506b7ca7a77f6bccd7c6ba22f13a70f Mon Sep 17 00:00:00 2001 From: Dominic Hopf Date: Feb 27 2017 09:51:39 +0000 Subject: Improvements to build 1.91 - Update the desktop file patch - Add missing files to file listing - Update setup-section for new Tarball name --- diff --git a/0000-terminator-fix-desktop-file.patch b/0000-terminator-fix-desktop-file.patch index 118fc25..712f829 100644 --- a/0000-terminator-fix-desktop-file.patch +++ b/0000-terminator-fix-desktop-file.patch @@ -1,9 +1,9 @@ ---- data/terminator.desktop.in 2011-08-22 20:42:49.000000000 +0200 -+++ data/terminator.desktop.in.fixed 2013-05-17 09:23:42.673630512 +0200 -@@ -9,7 +9,7 @@ - StartupNotify=true +--- data/terminator.desktop.in.orig 2017-02-27 10:19:04.779904158 +0100 ++++ data/terminator.desktop.in 2017-02-27 10:19:19.924000420 +0100 +@@ -10,7 +10,7 @@ X-Ubuntu-Gettext-Domain=terminator X-Ayatana-Desktop-Shortcuts=NewWindow; + Keywords=terminal;shell;prompt;command;commandline; -[NewWindow Shortcut Group] +[X-NewWindow Shortcut Group] Name=Open a New Window diff --git a/terminator-fix-NewWindow-issue.patch b/terminator-fix-NewWindow-issue.patch deleted file mode 100644 index 787f748..0000000 --- a/terminator-fix-NewWindow-issue.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 17e345f..205d82f 100644 --- a/terminator.spec +++ b/terminator.spec @@ -20,7 +20,7 @@ Requires: python-psutil Requires: python2-psutil %endif -Patch0: terminator-fix-NewWindow-issue.patch +Patch0: 0000-terminator-fix-desktop-file.patch %description @@ -32,7 +32,8 @@ arrangements of terminals for different tasks. %prep -%setup -q +%setup -q -n Terminator-%{version} + sed -i '/#! \?\/usr.*/d' terminatorlib/*.py %patch0 -p0 @@ -63,14 +64,15 @@ rm -rf %{buildroot} %{_bindir}/%{name}* %{_bindir}/remotinator %{python_sitelib}/* +%{_datadir}/%{name}/terminatorlib/themes/*/gtk-3.0/apps/*.css %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/*/%{name}*.png -%{_datadir}/icons/hicolor/*/*/%{name}*.svg %{_datadir}/icons/HighContrast/*/*/%{name}*.png %{_datadir}/icons/HighContrast/*/*/%{name}*.svg -%{_datadir}/icons/hicolor/16x16/status/terminal-bell.png %{_datadir}/icons/HighContrast/16x16/status/terminal-bell.png +%{_datadir}/icons/hicolor/*/*/%{name}*.png +%{_datadir}/icons/hicolor/*/*/%{name}*.svg +%{_datadir}/icons/hicolor/16x16/status/terminal-bell.png %{_datadir}/pixmaps/%{name}.png