Hello community, here is the log from the commit of package xfce4-panel-plugin-smartbookmark for openSUSE:Factory checked in at 2012-04-19 12:39:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-smartbookmark (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-smartbookmark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-smartbookmark", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel-plugin-smartbookmark/xfce4-panel-plugin-smartbookmark.changes 2011-11-14 13:46:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-smartbookmark.new/xfce4-panel-plugin-smartbookmark.changes 2012-04-19 12:39:51.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Apr 17 22:38:52 UTC 2012 - [email protected] + +- corrected source URL + +------------------------------------------------------------------- +Sun Apr 15 22:55:30 UTC 2012 - [email protected] + +- added xfce4-panel-plugin-smartbookmark-use-exo-open.patch in + order to use exo-open instead of xfbrowser4 which has been + removed in 4.10 (bxo#8642) +- use https://bugzilla.xfce.org/ as the default bookmark + +------------------------------------------------------------------- +Wed Apr 4 08:10:34 UTC 2012 - [email protected] + +- specfile cleanup +- correct dependencies +- split off -lang subpackage + +------------------------------------------------------------------- New: ---- xfce4-panel-plugin-smartbookmark-use-exo-open.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-smartbookmark.spec ++++++ --- /var/tmp/diff_new_pack.Jk3IVq/_old 2012-04-19 12:39:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Jk3IVq/_new 2012-04-19 12:39:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-panel-plugin-smartbookmark # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,28 +20,36 @@ %define plugin_name xfce4-smartbookmark-plugin Name: xfce4-panel-plugin-smartbookmark -License: GPL-2.0+ Version: 0.4.4 -Release: 25 -Summary: Smart bookmark plugin for the Xfce panel +Release: 0 +Summary: Smart Bookmark Plugin for the Xfce Panel +License: GPL-2.0+ +Group: System/GUI/XFCE Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin -Source0: xfce4-smartbookmark-plugin-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/panel-plugins/%{plugin_name}/0.4/%{plugin_name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM xfce4-panel-plugin-smartbookmark-use-exo-open.patch bxo#8642 [email protected] -- Use exo-open instead of xfbrowser4 which has been removed in 4.10 +Patch0: xfce4-panel-plugin-smartbookmark-use-exo-open.patch # PATCH-FEATURE-OPENSUSE xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch [email protected] -- Replaces Debian defaults and hides the label on to of the entry widget by default Patch2: xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch -Group: System/GUI/XFCE -BuildRequires: intltool BuildRequires: fdupes +BuildRequires: intltool +BuildRequires: pkgconfig(gdk-2.0) BuildRequires: pkgconfig(libxfce4panel-1.0) -Requires: xfce4-panel >= 4.8.0 +BuildRequires: pkgconfig(libxfcegui4-1.0) +Requires: exo +Requires: xfce4-panel >= %{panel_version} +Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Smartbookmark plugin follows the smart bookmark concept and allows users to send requests to websites through default browser. +%lang_package %prep %setup -q -n %{plugin_name}-%{version} +%patch0 -p1 %patch2 -p1 %build @@ -50,16 +58,21 @@ %install %make_install + rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} -%find_lang %{plugin_name} %{name}.lang + +%find_lang %{plugin_name} %{name}.lang %{?no_lang_C} + %fdupes %{buildroot}%{_datadir} %clean rm -rf %{buildroot} -%files -f %{name}.lang +%files %defattr(-,root,root) %{_libdir}/xfce4/panel-plugins/libsmartbookmark* %{_datadir}/xfce4/panel-plugins/smartbookmark.desktop +%files lang -f %{name}.lang + %changelog ++++++ xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch ++++++ --- /var/tmp/diff_new_pack.Jk3IVq/_old 2012-04-19 12:39:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Jk3IVq/_new 2012-04-19 12:39:52.000000000 +0200 @@ -1,28 +1,29 @@ -diff -urNp xfce4-smartbookmark-plugin-0.4.2.orig/src/smartbookmark.c xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.c ---- xfce4-smartbookmark-plugin-0.4.2.orig/src/smartbookmark.c 2011-02-08 16:07:39.000000000 +0100 -+++ xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.c 2011-02-08 16:20:12.000000000 +0100 -@@ -175,10 +175,10 @@ static t_search *search_new(XfcePanelPlu +Index: xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c +=================================================================== +--- xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c ++++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c +@@ -184,10 +184,10 @@ static t_search *search_new(XfcePanelPlu box = gtk_vbox_new(FALSE, 0); /* default options */ - search->url = "http://bugs.debian.org/";; - search->label_text = "BTS"; -+ search->url = "http://bugzilla.novell.com/";; -+ search->label_text = "bnc#"; ++ search->url = "https://bugzilla.xfce.org/show_bug.cgi?id=";; ++ search->label_text = "bxo#"; search->size = 5; - search->hide_label = FALSE; + search->hide_label = TRUE; /* read config file options */ filename = xfce_panel_plugin_save_location(plugin, TRUE); search_read_config(search, filename); -@@ -247,10 +247,10 @@ static void search_read_config(t_search +@@ -256,10 +256,10 @@ static void search_read_config(t_search if( (rcfile = xfce_rc_simple_open(filename, TRUE) )) { xfce_rc_set_group(rcfile, NULL); - search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugs.debian.org/";)); - search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","DBS")); -+ search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","http://bugzilla.novell.com/";)); -+ search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","bnc#")); ++ search->url = g_strdup(xfce_rc_read_entry(rcfile,"url","https://bugzilla.xfce.org/show_bug.cgi?id=";)); ++ search->label_text = g_strdup(xfce_rc_read_entry(rcfile,"value","bxo#")); search->size = xfce_rc_read_int_entry(rcfile, "size", 5); - search->hide_label = xfce_rc_read_bool_entry(rcfile, "hidelabel", FALSE); + search->hide_label = xfce_rc_read_bool_entry(rcfile, "hidelabel", TRUE); ++++++ xfce4-panel-plugin-smartbookmark-use-exo-open.patch ++++++ Index: xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c =================================================================== --- xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c +++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c @@ -75,18 +75,27 @@ XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(smar static gboolean do_search(const char *url, const char *keyword) { + gchar *argv[] = { "exo-open", "--launch", "WebBrowser", NULL, NULL }; + gchar *complete_url; + gboolean retval; + GError *error = NULL; + DBG ("Do search"); - gchar *execute; - gboolean success; - execute = g_strconcat("xfbrowser4 \"", url, NULL);//works better for me - //execute = g_strconcat("x-www-browser \"", url, NULL); - execute = g_strconcat(execute, keyword, NULL); - execute = g_strconcat(execute, "\"", NULL); - success = exec_command(execute); - g_free(execute); + complete_url = g_strconcat(url, keyword, NULL); + argv[3] = complete_url; + + retval = g_spawn_async(NULL, (gchar **)argv, NULL, + G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, &error); + + g_free(complete_url); + + if (!retval) { + xfce_err("%s", error->message); + g_error_free(error); + } - return success; + return retval; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
