Hello community, here is the log from the commit of package rofi for openSUSE:Factory checked in at 2015-08-05 19:14:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rofi (Old) and /work/SRC/openSUSE:Factory/.rofi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rofi" Changes: -------- --- /work/SRC/openSUSE:Factory/rofi/rofi.changes 2015-08-01 11:38:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rofi.new/rofi.changes 2015-08-05 19:14:54.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 4 10:48:35 UTC 2015 - [email protected] + +- Add patch 0001-Replace-x-terminal-emulator-with-xdg-terminal.patch + to use xdg-terminal instead of x-terminal-emulator. + +------------------------------------------------------------------- New: ---- 0001-Replace-x-terminal-emulator-with-xdg-terminal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rofi.spec ++++++ --- /var/tmp/diff_new_pack.pMjouH/_old 2015-08-05 19:14:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMjouH/_new 2015-08-05 19:14:54.000000000 +0200 @@ -24,6 +24,8 @@ Group: System/GUI/Other Url: https://davedavenport.github.io/rofi/ Source: https://github.com/DaveDavenport/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz +#It tries to use x-terminal-emulator which is only available on debian systems, I replace it with xdg-terminal. +Patch0: 0001-Replace-x-terminal-emulator-with-xdg-terminal.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libX11-devel @@ -32,10 +34,7 @@ BuildRequires: make BuildRequires: pango-devel BuildRequires: xorg-x11-devel -#Requires: libX11 -#Requires: libXinerama -#Requires: libxft -Requires: pango +Requires: xdg-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,6 +42,7 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ 0001-Replace-x-terminal-emulator-with-xdg-terminal.patch ++++++ >From 787a36f020ed1d902ed805444dd990ed01f2b51f Mon Sep 17 00:00:00 2001 From: Michael Vetter <[email protected]> Date: Mon, 3 Aug 2015 18:22:27 +0200 Subject: [PATCH] Replace x-terminal-emulator with xdg-terminal x-terminal-emulator is working only on debian and derivates AFAIK. I think xdg-open is the correct thing to use here since it behaves the same across all distros. Conflicts: test/helper-test.c diff --git a/config/config.def.c b/config/config.def.c index 47e63a3..ed2d6de 100644 --- a/config/config.def.c +++ b/config/config.def.c @@ -78,16 +78,16 @@ Settings config = { .menu_hlbg_urgent = "#DC322F", .menu_hlbg_active = "#268BD2", /** Terminal to use. (for ssh and open in terminal) */ - .terminal_emulator = "x-terminal-emulator", + .terminal_emulator = "xdg-terminal", .ssh_client = "ssh", /** Command when executing ssh. */ - .ssh_command = "{terminal} -e {ssh-client} {host}", + .ssh_command = "{terminal} '{ssh-client} {host}'", /** Command when running */ .run_command = "{cmd}", /** Command used to list executable commands. empty -> internal */ .run_list_command = "", /** Command executed when running application in terminal */ - .run_shell_command = "{terminal} -e {cmd}", + .run_shell_command = "{terminal} '{cmd}'", /** * Location of the window. * Enumeration indicating location or gravity of window. --- a/test/helper-test.c +++ b/test/helper-test.c @@ -17,7 +17,7 @@ int main ( int argc, char ** argv ) int llength = 0; char * test_str = "{host} {terminal} -e bash -c \"{ssh-client} {host}; echo '{terminal} {host}'\""; helper_parse_setup( test_str, &list, &llength, "{host}", "chuck", - "{terminal}", "x-terminal-emulator", NULL); + "{terminal}", "xdg-terminal", NULL); TASSERT ( llength == 6 ); TASSERT ( strcmp(list[0], "chuck") == 0 ); -- 2.1.4
